diff options
| author | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2021-08-05 14:59:39 +0000 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2021-09-27 15:39:42 +0000 |
| commit | 6366dec51066189211c3e48c49cb5a13b32f99a5 (patch) | |
| tree | 06b374a15fae5b53699b19bc70cfa24125328f3a | |
| parent | 1dc1041cb6b0fe8f11bfe852a840dea6fdebb13f (diff) | |
| download | kolla-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
| -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 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 %} diff --git a/kolla/common/config.py b/kolla/common/config.py index b09327ebd..3b2e80f0d 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -758,7 +758,7 @@ USERS = { }, 'mongodb-user': { # unused user (mongodb dropped) 'uid': 42432, - 'gid': 65534, + 'gid': 42432, }, 'murano-user': { 'uid': 42433, |