diff options
| author | Zuul <zuul@review.opendev.org> | 2022-04-22 08:46:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-04-22 08:46:55 +0000 |
| commit | 7cb4f7d01c5e61ebd5f324822e41910564d5563f (patch) | |
| tree | 0991b7f2611dee2380df9cbe203df436f07c4be2 /docker/haproxy/Dockerfile.j2 | |
| parent | 8650c57c12498c483445536af5b5a85ada87791e (diff) | |
| parent | e21aeb5ae955671937055baf57836120af8d4312 (diff) | |
| download | kolla-7cb4f7d01c5e61ebd5f324822e41910564d5563f.tar.gz kolla-7cb4f7d01c5e61ebd5f324822e41910564d5563f.zip | |
Merge "flatten images a bit"
Diffstat (limited to 'docker/haproxy/Dockerfile.j2')
| -rw-r--r-- | docker/haproxy/Dockerfile.j2 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/haproxy/Dockerfile.j2 b/docker/haproxy/Dockerfile.j2 index db03f6be1..27d4c9189 100644 --- a/docker/haproxy/Dockerfile.j2 +++ b/docker/haproxy/Dockerfile.j2 @@ -16,11 +16,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ] %} {{ macros.install_packages(haproxy_packages | customizable("packages")) }} -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 -RUN chmod 755 /usr/local/bin/kolla_ensure_haproxy_latest_config + +RUN mkdir -p /var/lib/kolla/haproxy \ + && chown -R haproxy: /var/lib /run \ + && chmod 755 /usr/local/bin/kolla_ensure_haproxy_latest_config {% block haproxy_footer %}{% endblock %} {% block footer %}{% endblock %} |