Merge branch 'Lednerb-fix-workspace-user-laradock-env'

3a3e58de · Winfried · 05faf245 · 26ecb096 · 3a3e58de · 3a3e58de
Commit 3a3e58de authored May 07, 2017 by Winfried
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 6 deletions

Dockerfile-56 workspace/Dockerfile-56 +6 -2

Dockerfile-70 workspace/Dockerfile-70 +6 -2

Dockerfile-71 workspace/Dockerfile-71 +6 -2

No files found.
--- a/workspace/Dockerfile-56
+++ b/workspace/Dockerfile-56
@@ -46,8 +46,12 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 # Add a non-root user to prevent files being created with root permissions on host machine.
 ARG PUID=1000
 ARG PGID=1000
-RUN groupadd -g $PGID laradock && \
-    useradd -u $PUID -g laradock -m laradock && \
+
+ENV PUID ${PUID}
+ENV PGID ${PGID}
+
+RUN groupadd -g ${PGID} laradock && \
+    useradd -u ${PUID} -g laradock -m laradock && \
    apt-get update -yqq

 #####################################

--- a/workspace/Dockerfile-70
+++ b/workspace/Dockerfile-70
@@ -46,8 +46,12 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 # Add a non-root user to prevent files being created with root permissions on host machine.
 ARG PUID=1000
 ARG PGID=1000
-RUN groupadd -g $PGID laradock && \
-    useradd -u $PUID -g laradock -m laradock && \
+
+ENV PUID ${PUID}
+ENV PGID ${PGID}
+
+RUN groupadd -g ${PGID} laradock && \
+    useradd -u ${PUID} -g laradock -m laradock && \
    apt-get update -yqq

 #####################################

--- a/workspace/Dockerfile-71
+++ b/workspace/Dockerfile-71
@@ -46,8 +46,12 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 # Add a non-root user to prevent files being created with root permissions on host machine.
 ARG PUID=1000
 ARG PGID=1000
-RUN groupadd -g $PGID laradock && \
-    useradd -u $PUID -g laradock -m laradock && \
+
+ENV PUID ${PUID}
+ENV PGID ${PGID}
+
+RUN groupadd -g ${PGID} laradock && \
+    useradd -u ${PUID} -g laradock -m laradock && \
    apt-get update -yqq

 #####################################