Reworked adding non-root user to docker images.

Reworked adding non-root user to docker images. #1626