3075685d01
There are a couple of issues with the mariadb image currently. 1. it doesn't include mysql_upgrade on CentOS/RHEL. It is necessary to run this after an upgrade of MariaDB. This is fixed by installing mariadb-server-utils. 2. it inherits the standard dumb-init entrypoint from the base image, which includes a --single-child argument. That causes signals to be forwarded only to the process executed by dumb-init, which in the case of kolla-ansible is mysqld_safe, however mysqld_safe ignores SIGTERM. After a timeout, Docker then forcibly kills the container. Executing dumb-init without --single-child ensures the TERM signal is sent to mysqld, allowing it to shutdown gracefully. Change-Id: I1a450736721863b91be1ea3d3c8948990de9fdeb Closes-Bug: #1820325
69 lines
2.0 KiB
Django/Jinja
69 lines
2.0 KiB
Django/Jinja
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
|
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
|
|
|
{% block mariadb_header %}{% endblock %}
|
|
|
|
{% import "macros.j2" as macros with context %}
|
|
|
|
{{ macros.configure_user(name='mysql') }}
|
|
|
|
{% if base_package_type == 'rpm' %}
|
|
{% set mariadb_packages = [
|
|
'expect',
|
|
'galera',
|
|
'hostname',
|
|
'mariadb',
|
|
'mariadb-backup',
|
|
'mariadb-server-galera',
|
|
'mariadb-server-utils',
|
|
'pv',
|
|
'rsync',
|
|
'tar'
|
|
] %}
|
|
|
|
{% elif base_package_type == 'deb' %}
|
|
{% set mariadb_packages = [
|
|
'expect'
|
|
] %}
|
|
{% if base_distro == 'debian' %}
|
|
{% set mariadb_packages = mariadb_packages + [
|
|
'mariadb-server'
|
|
] %}
|
|
{% else %}
|
|
{% set mariadb_packages = mariadb_packages + [
|
|
'mariadb-server',
|
|
'mariadb-client'
|
|
] %}
|
|
{% endif %}
|
|
{% endif %}
|
|
|
|
{{ macros.install_packages(mariadb_packages | customizable("packages")) }}
|
|
|
|
COPY mariadb_sudoers /etc/sudoers.d/kolla_mariadb_sudoers
|
|
COPY extend_start.sh /usr/local/bin/kolla_extend_start
|
|
COPY security_reset.expect /usr/local/bin/kolla_security_reset
|
|
RUN chmod 755 /usr/local/bin/kolla_extend_start \
|
|
&& chmod 755 /usr/local/bin/kolla_security_reset \
|
|
&& chmod 750 /etc/sudoers.d \
|
|
&& chmod 440 /etc/sudoers.d/kolla_mariadb_sudoers \
|
|
&& rm -rf /var/lib/mysql/*
|
|
|
|
{% if base_package_type == 'deb' %}
|
|
RUN mkdir -p /var/run/mysqld && chown mysql /var/run/mysqld && chmod 755 /var/run/mysqld
|
|
{% endif %}
|
|
|
|
{% block mariadb_entrypoint %}
|
|
# NOTE(mgoddard): Override the dumb-init arguments to avoid passing
|
|
# --single-child. This does not play well with mysqld_safe, which ignores
|
|
# SIGTERM, meaning Docker needs to forcibly kill the container to stop it.
|
|
# Without --single-child, the TERM signal is sent to all subprocesses,
|
|
# including mysqld.
|
|
ENTRYPOINT ["dumb-init"]
|
|
CMD ["kolla_start"]
|
|
{% endblock %}
|
|
|
|
{% block mariadb_footer %}{% endblock %}
|
|
{% block footer %}{% endblock %}
|
|
|
|
USER mysql
|