aboutsummaryrefslogtreecommitdiff
path: root/docker/ovsdpdk
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/ovsdpdk
parent68fa7d302095b5362f176b7e690e3cbaa516fae0 (diff)
parent11f65c6c1d3bfd6a12f8e71d778d46d635010449 (diff)
downloadkolla-dca8462bc491a93c6a6ae71e86d59a2dcb804ff5.tar.gz
kolla-dca8462bc491a93c6a6ae71e86d59a2dcb804ff5.zip
Merge "Add mechanism for patching files in containers"
Diffstat (limited to 'docker/ovsdpdk')
-rw-r--r--docker/ovsdpdk/ovsdpdk-db/Dockerfile.j24
-rw-r--r--docker/ovsdpdk/ovsdpdk-vswitchd/Dockerfile.j24
-rw-r--r--docker/ovsdpdk/ovsdpdk/Dockerfile.j22
3 files changed, 10 insertions, 0 deletions
diff --git a/docker/ovsdpdk/ovsdpdk-db/Dockerfile.j2 b/docker/ovsdpdk/ovsdpdk-db/Dockerfile.j2
index d38580207..3b2e99854 100644
--- a/docker/ovsdpdk/ovsdpdk-db/Dockerfile.j2
+++ b/docker/ovsdpdk/ovsdpdk-db/Dockerfile.j2
@@ -5,10 +5,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block ovsdpdk_db_header %}{% endblock %}
+{% import "macros.j2" as macros with context %}
+
COPY extend_start.sh /usr/local/bin/kolla_ovsdpdk_extend_start
COPY start_ovsdb_server.sh /usr/local/bin/start-ovsdb-server
RUN chmod 644 /usr/local/bin/kolla_ovsdpdk_extend_start && \
chmod 755 /usr/local/bin/start-ovsdb-server
+{{ macros.kolla_patch_sources() }}
+
{% block ovsdpdk_db_footer %}{% endblock %}
{% block footer %}{% endblock %}
diff --git a/docker/ovsdpdk/ovsdpdk-vswitchd/Dockerfile.j2 b/docker/ovsdpdk/ovsdpdk-vswitchd/Dockerfile.j2
index fb0673e22..378103b9c 100644
--- a/docker/ovsdpdk/ovsdpdk-vswitchd/Dockerfile.j2
+++ b/docker/ovsdpdk/ovsdpdk-vswitchd/Dockerfile.j2
@@ -5,8 +5,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block ovsdpdk_vswitchd_header %}{% endblock %}
+{% import "macros.j2" as macros with context %}
+
COPY extend_start.sh /usr/local/bin/kolla_ovsdpdk_extend_start
RUN chmod 644 /usr/local/bin/kolla_ovsdpdk_extend_start
+{{ macros.kolla_patch_sources() }}
+
{% block ovsdpdk_vswitchd_footer %}{% endblock %}
{% block footer %}{% endblock %}
diff --git a/docker/ovsdpdk/ovsdpdk/Dockerfile.j2 b/docker/ovsdpdk/ovsdpdk/Dockerfile.j2
index 794f17aa8..47a6d3473 100644
--- a/docker/ovsdpdk/ovsdpdk/Dockerfile.j2
+++ b/docker/ovsdpdk/ovsdpdk/Dockerfile.j2
@@ -35,4 +35,6 @@ RUN update-alternatives --set ovs-vswitchd /usr/lib/openvswitch-switch-dpdk/ovs-
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 644 /usr/local/bin/kolla_extend_start
+{{ macros.kolla_patch_sources() }}
+
{% block ovsdpdk_footer %}{% endblock %}