Skip to content

Commit 6366dec

Browse files
committed
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
1 parent 1dc1041 commit 6366dec

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

docker/base/Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ENV LANG en_US.UTF-8
2121
{# Specifics required such as homedir or shell are configured within the service specific image #}
2222
{%- for name, user in users | dictsort() %}
2323
{% if loop.first -%}RUN {% else %} && {% endif -%}
24-
groupadd --force --gid {{ user.gid }} {{ user.group }} \
24+
groupadd --gid {{ user.gid }} {{ user.group }} \
2525
&& useradd -l -M --shell /usr/sbin/nologin --uid {{ user.uid }} --gid {{ user.gid }} {{ name }}
2626
{%- if not loop.last %} \{% endif -%}
2727
{%- endfor %}

kolla/common/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -758,7 +758,7 @@
758758
},
759759
'mongodb-user': { # unused user (mongodb dropped)
760760
'uid': 42432,
761-
'gid': 65534,
761+
'gid': 42432,
762762
},
763763
'murano-user': {
764764
'uid': 42433,

0 commit comments

Comments
 (0)