Replaced shadow with addgroup and adduser

8 years ago · 972ce6b791
parent 65d0426b91
commit 972ce6b791
2 changed files with 10 additions and 16 deletions
--- a/13
+++ b/13
@ -6,7 +6,6 @@ EXPOSE 22 3000
 RUN apk update && \
  apk add \
    su-exec \
-    shadow \
    ca-certificates \
    sqlite \
    bash \
@ -18,17 +17,15 @@ RUN apk update && \
    tzdata && \
  rm -rf \
    /var/cache/apk/* && \
-  groupadd \
-    -r \
+  addgroup \
    -g 1000 \
    git && \
-  useradd \
-    -r -M \
-    -p '*' \
-    -d /data/git \
+  adduser \
+    -S -H -D \
+    -h /data/git \
    -s /bin/bash \
    -u 1000 \
-    -g git \
+    -G git \
    git

 ENV USER git
--- a/Dockerfile.rpi
+++ b/Dockerfile.rpi
@ -6,7 +6,6 @@ EXPOSE 22 3000
 RUN apk update && \
  apk add \
    su-exec \
-    shadow \
    ca-certificates \
    sqlite \
    bash \
@ -18,17 +17,15 @@ RUN apk update && \
    tzdata && \
  rm -rf \
    /var/cache/apk/* && \
-  groupadd \
-    -r \
+  addgroup \
    -g 1000 \
    git && \
-  useradd \
-    -r -M \
-    -p '*' \
-    -d /data/git \
+  adduser \
+    -S -H -D \
+    -h /data/git \
    -s /bin/bash \
    -u 1000 \
-    -g git \
+    -G git \
    git

 ENV USER git