Fix node.dockerfile when running as gid 100

Fixes #1650
nuwave · Dec 28, 2020 · aaadd09 · aaadd09
1 parent 035c1b9
commit aaadd09
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/node.dockerfile b/node.dockerfile
@@ -4,8 +4,8 @@ ARG USER_ID
 ARG GROUP_ID
 
 RUN if [ ${USER_ID:-0} -ne 0 ] && [ ${GROUP_ID:-0} -ne 0 ]; then \
-    groupmod -g ${GROUP_ID} node && \
-    usermod -u ${USER_ID} -g ${GROUP_ID} node \
+    groupmod --gid ${GROUP_ID} --non-unique node && \
+    usermod --uid ${USER_ID} --gid ${GROUP_ID} node \
 ;fi
 
 USER node
diff --git a/php.dockerfile b/php.dockerfile
@@ -30,9 +30,9 @@ ARG USER_ID
 ARG GROUP_ID
 
 RUN if [ ${USER_ID:-0} -ne 0 ] && [ ${GROUP_ID:-0} -ne 0 ]; then \
-    groupadd -f -g ${GROUP_ID} ${USER} &&\
-    useradd -l -u ${USER_ID} -g ${GROUP_ID} ${USER} &&\
-    install -d -m 0755 -o ${USER} -g ${GROUP_ID} /home/${USER} &&\
+    groupadd --force --gid ${GROUP_ID} ${USER} &&\
+    useradd --no-log-init --uid ${USER_ID} --gid ${GROUP_ID} ${USER} &&\
+    install --directory --mode 0755 --owner ${USER} --group ${GROUP_ID} /home/${USER} &&\
     chown --changes --silent --no-dereference --recursive ${USER_ID}:${GROUP_ID} /home/${USER} \
 ;fi