diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-17 14:27:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-17 14:27:13 +0000 |
| commit | be9a8789a698b45f9eb423c599fc603b80472bc9 (patch) | |
| tree | 0689a24a8738d770a1269f7da9c0a74005a11097 /docker/haproxy | |
| parent | 29642a8fcaebef4e60edfda040a0bf83e1d1f3a0 (diff) | |
| parent | 58eee09c15dea81ec51bb366af23681de70ceaa1 (diff) | |
| download | kolla-be9a8789a698b45f9eb423c599fc603b80472bc9.tar.gz kolla-be9a8789a698b45f9eb423c599fc603b80472bc9.zip | |
Merge "use static uid/gid in images"
Diffstat (limited to 'docker/haproxy')
| -rw-r--r-- | docker/haproxy/Dockerfile.j2 | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/docker/haproxy/Dockerfile.j2 b/docker/haproxy/Dockerfile.j2 index 6857087bd..964e0e663 100644 --- a/docker/haproxy/Dockerfile.j2 +++ b/docker/haproxy/Dockerfile.j2 @@ -5,14 +5,19 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} +{{ macros.configure_user(name='haproxy') }} + +{% if base_distro in ['ubuntu', 'debian'] %} +{{ macros.debian_haproxy_existing_user_fix() }} +{% endif %} + {% set haproxy_packages = [ 'haproxy', 'socat' ] %} {{ macros.install_packages(haproxy_packages | customizable("packages")) }} -RUN usermod -a -G kolla haproxy \ - && mkdir -p /var/lib/kolla/haproxy \ +RUN mkdir -p /var/lib/kolla/haproxy \ && chown -R haproxy: /var/lib /run COPY ensure_latest_config.sh /usr/local/bin/kolla_ensure_haproxy_latest_config |