diff options
| author | Zuul <zuul@review.opendev.org> | 2021-08-17 10:28:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-08-17 10:28:08 +0000 |
| commit | 6e23ef8f2ad88eb88307d19182d7dce355ad8a2a (patch) | |
| tree | e641d301f3f83af72e35e248a991c58370d18fac | |
| parent | 2cef13d134dca2ab890efd3d6ea43a7ad8a5ec06 (diff) | |
| parent | 20d8b83ecb99669caf501cd54a38eaa8ffebb0bd (diff) | |
| download | kolla-6e23ef8f2ad88eb88307d19182d7dce355ad8a2a.tar.gz kolla-6e23ef8f2ad88eb88307d19182d7dce355ad8a2a.zip | |
Merge "base/deb: bump 'system' groups limit beyond Kolla ones"
| -rw-r--r-- | docker/base/Dockerfile.j2 | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 7c771dd50..23c62385b 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -236,10 +236,14 @@ RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("cen {# endif for base_package_type rpm #} {% elif base_package_type == 'deb' %} # Customize PS1 bash shell -# enlarge 'system users' range so 'haproxy' package will not complain -# see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=939470 +# - enlarge 'system users' range so 'haproxy' package will not complain +# see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=939470 +# - enlarge 'system groups' range so 'hacluster' user added in +# https://review.opendev.org/c/openstack/kolla/+/802671 +# can be in 'haclient' group with same high uid RUN cat /tmp/kolla_bashrc >> /etc/bash.bashrc \ - && sed -i -e s/LAST_SYSTEM_UID=999/LAST_SYSTEM_UID=59999/g /etc/adduser.conf + && sed -i -e s/LAST_SYSTEM_UID=999/LAST_SYSTEM_UID=59999/g \ + -e s/LAST_SYSTEM_GID=999/LAST_SYSTEM_GID=59999/g /etc/adduser.conf # This will prevent questions from being asked during the install ENV DEBIAN_FRONTEND noninteractive |