aboutsummaryrefslogtreecommitdiff
path: root/docker/mariadb
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/mariadb
parent68fa7d302095b5362f176b7e690e3cbaa516fae0 (diff)
parent11f65c6c1d3bfd6a12f8e71d778d46d635010449 (diff)
downloadkolla-dca8462bc491a93c6a6ae71e86d59a2dcb804ff5.tar.gz
kolla-dca8462bc491a93c6a6ae71e86d59a2dcb804ff5.zip
Merge "Add mechanism for patching files in containers"
Diffstat (limited to 'docker/mariadb')
-rw-r--r--docker/mariadb/mariadb-base/Dockerfile.j22
-rw-r--r--docker/mariadb/mariadb-clustercheck/Dockerfile.j24
-rw-r--r--docker/mariadb/mariadb-server/Dockerfile.j22
3 files changed, 8 insertions, 0 deletions
diff --git a/docker/mariadb/mariadb-base/Dockerfile.j2 b/docker/mariadb/mariadb-base/Dockerfile.j2
index 620211197..e4e17a8bf 100644
--- a/docker/mariadb/mariadb-base/Dockerfile.j2
+++ b/docker/mariadb/mariadb-base/Dockerfile.j2
@@ -33,4 +33,6 @@ ARG mariadb_clustercheck_url=https://src.fedoraproject.org/rpms/mariadb/raw/${ma
RUN curl -o /usr/bin/clustercheck ${mariadb_clustercheck_url} \
&& chmod 755 /usr/bin/clustercheck
+{{ macros.kolla_patch_sources() }}
+
{% block mariadb_base_footer %}{% endblock %}
diff --git a/docker/mariadb/mariadb-clustercheck/Dockerfile.j2 b/docker/mariadb/mariadb-clustercheck/Dockerfile.j2
index 8068186db..7aee4ef05 100644
--- a/docker/mariadb/mariadb-clustercheck/Dockerfile.j2
+++ b/docker/mariadb/mariadb-clustercheck/Dockerfile.j2
@@ -5,11 +5,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block mariadb_clustercheck_header %}{% endblock %}
+{% import "macros.j2" as macros with context %}
+
COPY extend_start.sh /usr/local/bin/kolla_extend_start
COPY socat_wrapper.sh /usr/local/bin/socat_wrapper
RUN chmod 644 /usr/local/bin/kolla_extend_start && \
chmod 755 /usr/local/bin/socat_wrapper
+{{ macros.kolla_patch_sources() }}
+
{% block mariadb_clustercheck_footer %}{% endblock %}
{% block footer %}{% endblock %}
diff --git a/docker/mariadb/mariadb-server/Dockerfile.j2 b/docker/mariadb/mariadb-server/Dockerfile.j2
index b0f49ac09..ec17a5055 100644
--- a/docker/mariadb/mariadb-server/Dockerfile.j2
+++ b/docker/mariadb/mariadb-server/Dockerfile.j2
@@ -75,6 +75,8 @@ CMD ["kolla_start"]
{% endblock %}
{% endif %}
+{{ macros.kolla_patch_sources() }}
+
{% block mariadb_footer %}{% endblock %}
{% block footer %}{% endblock %}