diff options
| author | Zuul <zuul@review.opendev.org> | 2024-11-15 12:09:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2024-11-15 12:09:58 +0000 |
| commit | dca8462bc491a93c6a6ae71e86d59a2dcb804ff5 (patch) | |
| tree | bc41637caaa762e5dce1452c16d3b5f52f3cbf96 /docker/haproxy | |
| parent | 68fa7d302095b5362f176b7e690e3cbaa516fae0 (diff) | |
| parent | 11f65c6c1d3bfd6a12f8e71d778d46d635010449 (diff) | |
| download | kolla-dca8462bc491a93c6a6ae71e86d59a2dcb804ff5.tar.gz kolla-dca8462bc491a93c6a6ae71e86d59a2dcb804ff5.zip | |
Merge "Add mechanism for patching files in containers"
Diffstat (limited to 'docker/haproxy')
| -rw-r--r-- | docker/haproxy/haproxy-ssh/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/haproxy/haproxy/Dockerfile.j2 | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/docker/haproxy/haproxy-ssh/Dockerfile.j2 b/docker/haproxy/haproxy-ssh/Dockerfile.j2 index 98a083f5a..b875875f8 100644 --- a/docker/haproxy/haproxy-ssh/Dockerfile.j2 +++ b/docker/haproxy/haproxy-ssh/Dockerfile.j2 @@ -36,5 +36,7 @@ RUN chmod 644 /usr/local/bin/kolla_extend_start \ COPY update-haproxy-cert.sh /usr/bin/update-haproxy-cert +{{ macros.kolla_patch_sources() }} + {% block haproxy_ssh_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/haproxy/haproxy/Dockerfile.j2 b/docker/haproxy/haproxy/Dockerfile.j2 index 3d3614fba..24567679f 100644 --- a/docker/haproxy/haproxy/Dockerfile.j2 +++ b/docker/haproxy/haproxy/Dockerfile.j2 @@ -20,5 +20,7 @@ RUN mkdir -p /var/lib/kolla/haproxy \ && chown -R haproxy: /var/lib /run \ && chmod 755 /usr/local/bin/kolla_ensure_haproxy_latest_config +{{ macros.kolla_patch_sources() }} + {% block haproxy_footer %}{% endblock %} {% block footer %}{% endblock %} |