openstack/kolla
Code Issues Proposed changes

Move clustercheck script to mariadb-base

Browse Source 
This patch moves clustercheck script to
mariadb-base image, so it can be used for
mariadb's docker healthcheck.

Change-Id: I4abcbf67a84b7e96f42cd5e1324ff79e47eb1cb5
This commit is contained in:
Michal Arbet 2021-08-23 13:10:06 +02:00
parent b30b70c07d
commit acc23bb607
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/mariadb/mariadb-base/Dockerfile.j2
View File

@ -24,4 +24,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.install_packages(mariadb_base_packages | customizable("packages")) }} {{ 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 %} {% block mariadb_base_footer %}{% endblock %}

13
docker/mariadb/mariadb-clustercheck/Dockerfile.j2
View File

@ -5,24 +5,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% 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 = [ {% set mariadb_clustercheck_packages = [
'xinetd' 'xinetd'
] %} ] %}
{% endif %}
{{ macros.install_packages(mariadb_clustercheck_packages | customizable("packages")) }} {{ 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 mariadb_clustercheck_footer %}{% endblock %}
{% block footer %}{% endblock %} {% block footer %}{% endblock %}