Merge "Avoid the use of --force in groupadd"
This commit is contained in:
commit
150efda301
|
@ -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 %}
|
||||
|
|
|
@ -760,7 +760,7 @@ USERS = {
|
|||
},
|
||||
'mongodb-user': { # unused user (mongodb dropped)
|
||||
'uid': 42432,
|
||||
'gid': 65534,
|
||||
'gid': 42432,
|
||||
},
|
||||
'murano-user': {
|
||||
'uid': 42433,
|
||||
|
|
Loading…
Reference in New Issue