diff options
| author | Zuul <zuul@review.openstack.org> | 2019-04-13 14:57:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-04-13 14:57:40 +0000 |
| commit | 32693b83385c3b76ba0edf7e426bb110c6c335ae (patch) | |
| tree | c687b63e3e37128de0e72695c7d4f2a0563190f2 /docker/mariadb | |
| parent | 68b17a2bed7bf47a0fdc63c9e47354cc6c0300fa (diff) | |
| parent | fb4cb9efda5a522ba0d837047385b61275d09150 (diff) | |
| download | kolla-32693b83385c3b76ba0edf7e426bb110c6c335ae.tar.gz kolla-32693b83385c3b76ba0edf7e426bb110c6c335ae.zip | |
Merge "Add config option use_dumb_init to add it to container images"
Diffstat (limited to 'docker/mariadb')
| -rw-r--r-- | docker/mariadb/Dockerfile.j2 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/docker/mariadb/Dockerfile.j2 b/docker/mariadb/Dockerfile.j2 index cc7b27194..4e2f57f48 100644 --- a/docker/mariadb/Dockerfile.j2 +++ b/docker/mariadb/Dockerfile.j2 @@ -52,15 +52,18 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start \ RUN mkdir -p /var/run/mysqld && chown mysql /var/run/mysqld && chmod 755 /var/run/mysqld {% endif %} +{% if use_dumb_init %} {% 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"] + +ENTRYPOINT ["dumb-init", "--"] CMD ["kolla_start"] {% endblock %} +{% endif %} {% block mariadb_footer %}{% endblock %} {% block footer %}{% endblock %} |
