aboutsummaryrefslogtreecommitdiff
path: root/docker/base
diff options
context:
space:
mode:
authorRadosław Piliszek <radoslaw.piliszek@gmail.com>2021-08-05 14:59:39 +0000
committerRadosław Piliszek <radoslaw.piliszek@gmail.com>2021-09-27 15:39:42 +0000
commit6366dec51066189211c3e48c49cb5a13b32f99a5 (patch)
tree06b374a15fae5b53699b19bc70cfa24125328f3a /docker/base
parent1dc1041cb6b0fe8f11bfe852a840dea6fdebb13f (diff)
downloadkolla-6366dec51066189211c3e48c49cb5a13b32f99a5.tar.gz
kolla-6366dec51066189211c3e48c49cb5a13b32f99a5.zip
Avoid the use of --force in groupadd
According to the man page, --force may ignore --gid and this is not what we want. With our ID system it is almost impossible that we hit this issue but better be safe than sorry. ;-) Change-Id: I359982ddd144e07f8296b384638cf0b5331e495c
Diffstat (limited to 'docker/base')
-rw-r--r--docker/base/Dockerfile.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index b6344b37d..2ba82db9b 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -21,7 +21,7 @@ ENV LANG en_US.UTF-8
{# Specifics required such as homedir or shell are configured within the service specific image #}
{%- for name, user in users | dictsort() %}
{% if loop.first -%}RUN {% else %} && {% endif -%}
- groupadd --force --gid {{ user.gid }} {{ user.group }} \
+ groupadd --gid {{ user.gid }} {{ user.group }} \
&& useradd -l -M --shell /usr/sbin/nologin --uid {{ user.uid }} --gid {{ user.gid }} {{ name }}
{%- if not loop.last %} \{% endif -%}
{%- endfor %}