aboutsummaryrefslogtreecommitdiff
path: root/docker/zun
diff options
context:
space:
mode:
Diffstat (limited to 'docker/zun')
-rw-r--r--docker/zun/zun-api/Dockerfile.j24
-rw-r--r--docker/zun/zun-base/Dockerfile.j22
-rw-r--r--docker/zun/zun-cni-daemon/Dockerfile.j22
-rw-r--r--docker/zun/zun-compute/Dockerfile.j22
-rw-r--r--docker/zun/zun-wsproxy/Dockerfile.j24
5 files changed, 14 insertions, 0 deletions
diff --git a/docker/zun/zun-api/Dockerfile.j2 b/docker/zun/zun-api/Dockerfile.j2
index ed68d0b35..ded752ae6 100644
--- a/docker/zun/zun-api/Dockerfile.j2
+++ b/docker/zun/zun-api/Dockerfile.j2
@@ -5,8 +5,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block zun_api_header %}{% endblock %}
+{% import "macros.j2" as macros with context %}
+
COPY extend_start.sh /usr/local/bin/kolla_zun_extend_start
RUN chmod 644 /usr/local/bin/kolla_zun_extend_start
+{{ macros.kolla_patch_sources() }}
+
{% block zun_api_footer %}{% endblock %}
{% block footer %}{% endblock %}
diff --git a/docker/zun/zun-base/Dockerfile.j2 b/docker/zun/zun-base/Dockerfile.j2
index 242a6632c..908720b94 100644
--- a/docker/zun/zun-base/Dockerfile.j2
+++ b/docker/zun/zun-base/Dockerfile.j2
@@ -50,4 +50,6 @@ RUN ln -s zun-base-source/* zun \
&& chmod 755 /var/www/cgi-bin/zun \
&& chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_zun_extend_start
+{{ macros.kolla_patch_sources() }}
+
{% block zun_base_footer %}{% endblock %}
diff --git a/docker/zun/zun-cni-daemon/Dockerfile.j2 b/docker/zun/zun-cni-daemon/Dockerfile.j2
index 3046dcd9f..02cc9b2be 100644
--- a/docker/zun/zun-cni-daemon/Dockerfile.j2
+++ b/docker/zun/zun-cni-daemon/Dockerfile.j2
@@ -36,5 +36,7 @@ RUN chmod 750 /etc/sudoers.d \
&& tar -C /opt -xzvf /tmp/cni-plugins.tgz ./loopback \
&& rm -f /tmp/cni-plugins.tgz
+{{ macros.kolla_patch_sources() }}
+
{% block zun_cni_daemon_footer %}{% endblock %}
{% block footer %}{% endblock %}
diff --git a/docker/zun/zun-compute/Dockerfile.j2 b/docker/zun/zun-compute/Dockerfile.j2
index 45964c4a9..17f34e0be 100644
--- a/docker/zun/zun-compute/Dockerfile.j2
+++ b/docker/zun/zun-compute/Dockerfile.j2
@@ -25,6 +25,8 @@ RUN chmod 644 /usr/local/bin/kolla_zun_extend_start \
&& chmod 750 /etc/sudoers.d \
&& chmod 640 /etc/sudoers.d/kolla_zun_sudoers
+{{ macros.kolla_patch_sources() }}
+
{% block zun_compute_footer %}{% endblock %}
{% block footer %}{% endblock %}
diff --git a/docker/zun/zun-wsproxy/Dockerfile.j2 b/docker/zun/zun-wsproxy/Dockerfile.j2
index 5e76b755f..09350ad40 100644
--- a/docker/zun/zun-wsproxy/Dockerfile.j2
+++ b/docker/zun/zun-wsproxy/Dockerfile.j2
@@ -5,6 +5,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block zun_wsproxy_header %}{% endblock %}
+{% import "macros.j2" as macros with context %}
+
+{{ macros.kolla_patch_sources() }}
+
{% block zun_wsproxy_footer %}{% endblock %}
{% block footer %}{% endblock %}