aboutsummaryrefslogtreecommitdiff
path: root/docker/barbican
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2024-11-15 12:09:58 +0000
committerGerrit Code Review <review@openstack.org>2024-11-15 12:09:58 +0000
commitdca8462bc491a93c6a6ae71e86d59a2dcb804ff5 (patch)
treebc41637caaa762e5dce1452c16d3b5f52f3cbf96 /docker/barbican
parent68fa7d302095b5362f176b7e690e3cbaa516fae0 (diff)
parent11f65c6c1d3bfd6a12f8e71d778d46d635010449 (diff)
downloadkolla-dca8462bc491a93c6a6ae71e86d59a2dcb804ff5.tar.gz
kolla-dca8462bc491a93c6a6ae71e86d59a2dcb804ff5.zip
Merge "Add mechanism for patching files in containers"
Diffstat (limited to 'docker/barbican')
-rw-r--r--docker/barbican/barbican-api/Dockerfile.j22
-rw-r--r--docker/barbican/barbican-base/Dockerfile.j22
-rw-r--r--docker/barbican/barbican-keystone-listener/Dockerfile.j22
-rw-r--r--docker/barbican/barbican-worker/Dockerfile.j22
4 files changed, 8 insertions, 0 deletions
diff --git a/docker/barbican/barbican-api/Dockerfile.j2 b/docker/barbican/barbican-api/Dockerfile.j2
index 7f4653921..2871b994c 100644
--- a/docker/barbican/barbican-api/Dockerfile.j2
+++ b/docker/barbican/barbican-api/Dockerfile.j2
@@ -11,6 +11,8 @@ COPY extend_start.sh /usr/local/bin/kolla_barbican_extend_start
RUN chmod 644 /usr/local/bin/kolla_barbican_extend_start
+{{ macros.kolla_patch_sources() }}
+
{% block barbican_api_footer %}{% endblock %}
{% block footer %}{% endblock %}
diff --git a/docker/barbican/barbican-base/Dockerfile.j2 b/docker/barbican/barbican-base/Dockerfile.j2
index 5e46a9777..6632433cc 100644
--- a/docker/barbican/barbican-base/Dockerfile.j2
+++ b/docker/barbican/barbican-base/Dockerfile.j2
@@ -38,4 +38,6 @@ RUN ln -s barbican-base-source/* barbican \
&& touch /usr/local/bin/kolla_barbican_extend_start \
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_barbican_extend_start
+{{ macros.kolla_patch_sources() }}
+
{% block barbican_base_footer %}{% endblock %}
diff --git a/docker/barbican/barbican-keystone-listener/Dockerfile.j2 b/docker/barbican/barbican-keystone-listener/Dockerfile.j2
index e3cfd2e57..018b6d18d 100644
--- a/docker/barbican/barbican-keystone-listener/Dockerfile.j2
+++ b/docker/barbican/barbican-keystone-listener/Dockerfile.j2
@@ -7,6 +7,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
+{{ macros.kolla_patch_sources() }}
+
{% block barbican_keystone_listener_footer %}{% endblock %}
{% block footer %}{% endblock %}
diff --git a/docker/barbican/barbican-worker/Dockerfile.j2 b/docker/barbican/barbican-worker/Dockerfile.j2
index 8e40f6e28..63503f05d 100644
--- a/docker/barbican/barbican-worker/Dockerfile.j2
+++ b/docker/barbican/barbican-worker/Dockerfile.j2
@@ -7,6 +7,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
+{{ macros.kolla_patch_sources() }}
+
{% block barbican_worker_footer %}{% endblock %}
{% block footer %}{% endblock %}