diff options
| author | Michal Arbet <michal.arbet@ultimum.io> | 2021-08-23 13:10:06 +0200 |
|---|---|---|
| committer | Michal Arbet <michal.arbet@ultimum.io> | 2021-08-31 16:14:52 +0200 |
| commit | acc23bb607c062979496358a5b560ef9de6b2f09 (patch) | |
| tree | a5e5034a2ba9933ac81a4399c13d5330d47c9c12 /docker/mariadb | |
| parent | b30b70c07d57366feb630807531bd64534eb6a3e (diff) | |
| download | kolla-acc23bb607c062979496358a5b560ef9de6b2f09.tar.gz kolla-acc23bb607c062979496358a5b560ef9de6b2f09.zip | |
Move clustercheck script to mariadb-base
This patch moves clustercheck script to
mariadb-base image, so it can be used for
mariadb's docker healthcheck.
Change-Id: I4abcbf67a84b7e96f42cd5e1324ff79e47eb1cb5
Diffstat (limited to 'docker/mariadb')
| -rw-r--r-- | docker/mariadb/mariadb-base/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/mariadb/mariadb-clustercheck/Dockerfile.j2 | 19 |
2 files changed, 6 insertions, 16 deletions
diff --git a/docker/mariadb/mariadb-base/Dockerfile.j2 b/docker/mariadb/mariadb-base/Dockerfile.j2 index bf7428191..23c192213 100644 --- a/docker/mariadb/mariadb-base/Dockerfile.j2 +++ b/docker/mariadb/mariadb-base/Dockerfile.j2 @@ -24,4 +24,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.install_packages(mariadb_base_packages | customizable("packages")) }} +RUN curl -o /usr/bin/clustercheck https://src.fedoraproject.org/rpms/mariadb/raw/10.3/f/clustercheck.sh \ + && chmod 755 /usr/bin/clustercheck + {% block mariadb_base_footer %}{% endblock %} diff --git a/docker/mariadb/mariadb-clustercheck/Dockerfile.j2 b/docker/mariadb/mariadb-clustercheck/Dockerfile.j2 index a62e29398..aa52f8f4a 100644 --- a/docker/mariadb/mariadb-clustercheck/Dockerfile.j2 +++ b/docker/mariadb/mariadb-clustercheck/Dockerfile.j2 @@ -5,24 +5,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{% if base_package_type == 'rpm' %} - {% set mariadb_clustercheck_packages = [ - 'mariadb-server-galera', - 'xinetd' - ] %} - -{% elif base_package_type == 'deb' %} - {% set mariadb_clustercheck_packages = [ - 'xinetd' - ] %} -{% endif %} +{% set mariadb_clustercheck_packages = [ + 'xinetd' +] %} {{ macros.install_packages(mariadb_clustercheck_packages | customizable("packages")) }} -{% if base_package_type == 'deb' %} -RUN curl -o /usr/bin/clustercheck https://src.fedoraproject.org/rpms/mariadb/raw/10.3/f/clustercheck.sh \ - && chmod 755 /usr/bin/clustercheck -{% endif %} - {% block mariadb_clustercheck_footer %}{% endblock %} {% block footer %}{% endblock %} |