Fix: User and group creation of stash for mongodb and mysql (#786)

stashed · May 15, 2019 · e962a1c · e962a1c
1 parent 228df5a
commit e962a1c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/hack/docker/setup-mongo.sh b/hack/docker/setup-mongo.sh
@@ -61,11 +61,11 @@ build_docker() {
 FROM mongo:4.1.7
 
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
-RUN addgroup -g 1005 stash \
-    && adduser -u 1005 -G stash -D stash
+RUN groupadd -r stash --gid=1005 \
+    && useradd -r -g stash  --uid=1005 stash
 
 RUN set -x \
-  && apk add --update --no-cache ca-certificates
+    && apt-get update && apt-get install -y --no-install-recommends ca-certificates
 
 COPY restic_${NEW_RESTIC_VER} /bin/restic_${NEW_RESTIC_VER}
 COPY stash /bin/stash

diff --git a/hack/docker/setup-mysql.sh b/hack/docker/setup-mysql.sh
@@ -58,14 +58,14 @@ build_docker() {
   chmod 755 restic_${NEW_RESTIC_VER}
 
   cat >Dockerfile <<EOL
-FROM mysql:8.0.3
+FROM mysql:8.0.14
 
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
-RUN addgroup -g 1005 stash \
-    && adduser -u 1005 -G stash -D stash
+RUN groupadd -r stash --gid=1005 \
+    && useradd -r -g stash  --uid=1005 stash
 
 RUN set -x \
-  && apk add --update --no-cache ca-certificates
+    && apt-get update && apt-get install -y --no-install-recommends ca-certificates
 
 COPY restic_${NEW_RESTIC_VER} /bin/restic_${NEW_RESTIC_VER}
 COPY stash /bin/stash