From 1c5f0d01aafeb30b04b89cfe020ba34b505ee3b9 Mon Sep 17 00:00:00 2001 From: Eric Bolinger Date: Wed, 7 Apr 2021 16:08:01 -0600 Subject: [PATCH 1/2] Add -m option to useradd command --- 3.6/Dockerfile | 2 +- 4.0/Dockerfile | 2 +- 4.2/Dockerfile | 2 +- 4.4/Dockerfile | 2 +- Dockerfile-linux.template | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/3.6/Dockerfile b/3.6/Dockerfile index 7077676598..9d55cc06ff 100644 --- a/3.6/Dockerfile +++ b/3.6/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:xenial # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added -RUN groupadd -r mongodb && useradd -r -g mongodb mongodb +RUN groupadd -r mongodb && useradd -m -r -g mongodb mongodb RUN set -eux; \ apt-get update; \ diff --git a/4.0/Dockerfile b/4.0/Dockerfile index 116dcbe297..76bd9c811c 100644 --- a/4.0/Dockerfile +++ b/4.0/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:xenial # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added -RUN groupadd -r mongodb && useradd -r -g mongodb mongodb +RUN groupadd -r mongodb && useradd -m -r -g mongodb mongodb RUN set -eux; \ apt-get update; \ diff --git a/4.2/Dockerfile b/4.2/Dockerfile index ac91b935d9..70c840e132 100644 --- a/4.2/Dockerfile +++ b/4.2/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:bionic # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added -RUN groupadd -r mongodb && useradd -r -g mongodb mongodb +RUN groupadd -r mongodb && useradd -m -r -g mongodb mongodb RUN set -eux; \ apt-get update; \ diff --git a/4.4/Dockerfile b/4.4/Dockerfile index 805bfc0001..39a1257c76 100644 --- a/4.4/Dockerfile +++ b/4.4/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:bionic # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added -RUN groupadd -r mongodb && useradd -r -g mongodb mongodb +RUN groupadd -r mongodb && useradd -m -r -g mongodb mongodb RUN set -eux; \ apt-get update; \ diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template index 3c42d04827..6e0a5a98ec 100644 --- a/Dockerfile-linux.template +++ b/Dockerfile-linux.template @@ -1,7 +1,7 @@ FROM placeholder # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added -RUN groupadd -r mongodb && useradd -r -g mongodb mongodb +RUN groupadd -r mongodb && useradd -m -r -g mongodb mongodb RUN set -eux; \ apt-get update; \ From 0c20e85ca40dad640b002fa4c92acbd1d4a29c45 Mon Sep 17 00:00:00 2001 From: Eric Bolinger Date: Tue, 13 Apr 2021 16:13:52 -0600 Subject: [PATCH 2/2] Update from PR feedback --- 3.6/Dockerfile | 4 +++- 4.0/Dockerfile | 4 +++- 4.2/Dockerfile | 4 +++- 4.4/Dockerfile | 4 +++- Dockerfile-linux.template | 4 +++- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/3.6/Dockerfile b/3.6/Dockerfile index 9d55cc06ff..b5d53ee538 100644 --- a/3.6/Dockerfile +++ b/3.6/Dockerfile @@ -1,7 +1,9 @@ FROM ubuntu:xenial # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added -RUN groupadd -r mongodb && useradd -m -r -g mongodb mongodb +RUN set -ex; \ + groupadd --system mongodb; \ + useradd --system --gid mongodb --home-dir /var/mongodb --create-home mongodb RUN set -eux; \ apt-get update; \ diff --git a/4.0/Dockerfile b/4.0/Dockerfile index 76bd9c811c..d558903dda 100644 --- a/4.0/Dockerfile +++ b/4.0/Dockerfile @@ -1,7 +1,9 @@ FROM ubuntu:xenial # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added -RUN groupadd -r mongodb && useradd -m -r -g mongodb mongodb +RUN set -ex; \ + groupadd --system mongodb; \ + useradd --system --gid mongodb --home-dir /var/mongodb --create-home mongodb RUN set -eux; \ apt-get update; \ diff --git a/4.2/Dockerfile b/4.2/Dockerfile index 70c840e132..a5e474da4f 100644 --- a/4.2/Dockerfile +++ b/4.2/Dockerfile @@ -1,7 +1,9 @@ FROM ubuntu:bionic # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added -RUN groupadd -r mongodb && useradd -m -r -g mongodb mongodb +RUN set -ex; \ + groupadd --system mongodb; \ + useradd --system --gid mongodb --home-dir /var/mongodb --create-home mongodb RUN set -eux; \ apt-get update; \ diff --git a/4.4/Dockerfile b/4.4/Dockerfile index 39a1257c76..09f2b5eacd 100644 --- a/4.4/Dockerfile +++ b/4.4/Dockerfile @@ -1,7 +1,9 @@ FROM ubuntu:bionic # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added -RUN groupadd -r mongodb && useradd -m -r -g mongodb mongodb +RUN set -ex; \ + groupadd --system mongodb; \ + useradd --system --gid mongodb --home-dir /var/mongodb --create-home mongodb RUN set -eux; \ apt-get update; \ diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template index 6e0a5a98ec..9807c43f09 100644 --- a/Dockerfile-linux.template +++ b/Dockerfile-linux.template @@ -1,7 +1,9 @@ FROM placeholder # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added -RUN groupadd -r mongodb && useradd -m -r -g mongodb mongodb +RUN set -ex; \ + groupadd --system mongodb; \ + useradd --system --gid mongodb --home-dir /var/mongodb --create-home mongodb RUN set -eux; \ apt-get update; \