From 972ce6b791244ca99959a725aed693628ae895ef Mon Sep 17 00:00:00 2001
From: Thomas Boerger <tboerger@suse.de>
Date: Mon, 28 Nov 2016 17:22:22 +0100
Subject: [PATCH] Replaced shadow with addgroup and adduser

---
 Dockerfile     | 13 +++++--------
 Dockerfile.rpi | 13 +++++--------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index fd25c88346d2..c5aba1cfe9ae 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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
diff --git a/Dockerfile.rpi b/Dockerfile.rpi
index d237a63ba091..c618c94f2a1c 100644
--- 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