diff options
Diffstat (limited to 'docker/mariadb')
| -rw-r--r-- | docker/mariadb/mariadb-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/mariadb/mariadb-clustercheck/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/mariadb/mariadb-server/Dockerfile.j2 | 2 |
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 %} |
