diff options
| author | Zuul <zuul@review.opendev.org> | 2021-09-30 20:22:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-09-30 20:22:29 +0000 |
| commit | 150efda3013ea57147440e6b78fc8afb9f25bdec (patch) | |
| tree | 1f69b40b29a3c2c929134a52c559d151ef660188 | |
| parent | e4f019a5ddfca68c7f0ac5cbfdeb47e88e170d20 (diff) | |
| parent | 6366dec51066189211c3e48c49cb5a13b32f99a5 (diff) | |
| download | kolla-150efda3013ea57147440e6b78fc8afb9f25bdec.tar.gz kolla-150efda3013ea57147440e6b78fc8afb9f25bdec.zip | |
Merge "Avoid the use of --force in groupadd"
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 | ||||
| -rwxr-xr-x | kolla/common/config.py | 2 |
2 files changed, 2 insertions, 2 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 %} diff --git a/kolla/common/config.py b/kolla/common/config.py index b8f9a4661..49cb3ed2d 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -760,7 +760,7 @@ USERS = { }, 'mongodb-user': { # unused user (mongodb dropped) 'uid': 42432, - 'gid': 65534, + 'gid': 42432, }, 'murano-user': { 'uid': 42433, |