diff options
| author | Zuul <zuul@review.opendev.org> | 2019-09-14 18:32:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-09-14 18:32:42 +0000 |
| commit | 6c74c73a2415229c136f9854102fc99f9a8bc7c2 (patch) | |
| tree | 932d208b88b26137914cb86b6d472d0523dd2613 | |
| parent | 532af2efc8893cfd23f8d2beadd32a4e3463ae85 (diff) | |
| parent | 109706aa8b26f6f915e1cadae89de8135c3b68bf (diff) | |
| download | kolla-6c74c73a2415229c136f9854102fc99f9a8bc7c2.tar.gz kolla-6c74c73a2415229c136f9854102fc99f9a8bc7c2.zip | |
Merge "base/deb: bump 'system' users limit beyond Kolla ones"
| -rw-r--r-- | docker/base/Dockerfile.j2 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 1acfe0202..209b191e6 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -285,7 +285,10 @@ RUN if [ $(awk -F '=' '/DISTRIB_RELEASE/{print $2}' /etc/lsb-release) != "{{ sup echo "Only release '{{ supported_distro_release }}' is supported on {{ base_distro }}"; false; fi # Customize PS1 bash shell -RUN cat /tmp/kolla_bashrc >> /etc/bash.bashrc +# enlarge 'system users' range so 'haproxy' package will not complain +# see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=939470 +RUN cat /tmp/kolla_bashrc >> /etc/bash.bashrc \ + && sed -i -e s/LAST_SYSTEM_UID=999/LAST_SYSTEM_UID=59999/g /etc/adduser.conf # This will prevent questions from being asked during the install ENV DEBIAN_FRONTEND noninteractive |