aboutsummaryrefslogtreecommitdiff
path: root/docker/base/Dockerfile.j2
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2021-09-30 20:22:29 +0000
committerGerrit Code Review <review@openstack.org>2021-09-30 20:22:29 +0000
commit150efda3013ea57147440e6b78fc8afb9f25bdec (patch)
tree1f69b40b29a3c2c929134a52c559d151ef660188 /docker/base/Dockerfile.j2
parente4f019a5ddfca68c7f0ac5cbfdeb47e88e170d20 (diff)
parent6366dec51066189211c3e48c49cb5a13b32f99a5 (diff)
downloadkolla-150efda3013ea57147440e6b78fc8afb9f25bdec.tar.gz
kolla-150efda3013ea57147440e6b78fc8afb9f25bdec.zip
Merge "Avoid the use of --force in groupadd"
Diffstat (limited to 'docker/base/Dockerfile.j2')
-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 ac43f0538..8a49ce32f 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 %}