diff options
| author | Zuul <zuul@review.opendev.org> | 2024-03-18 11:39:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2024-03-18 11:39:59 +0000 |
| commit | ff798d757bf1fbc684348f32bbf6ebde13ffc3bb (patch) | |
| tree | 732297330ef0cf37809e1092c75adde6a3ced325 /docker | |
| parent | a0e22caa8a131486de6cbcf0a4d9b13c6e7c0547 (diff) | |
| parent | dd3e46cd836aa536b872bdb0349b2b2a083553e3 (diff) | |
| download | kolla-ff798d757bf1fbc684348f32bbf6ebde13ffc3bb.tar.gz kolla-ff798d757bf1fbc684348f32bbf6ebde13ffc3bb.zip | |
Merge "mariadb-clustercheck: Add a script handling signals"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/mariadb/mariadb-clustercheck/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/mariadb/mariadb-clustercheck/socat_wrapper.sh | 19 |
2 files changed, 22 insertions, 1 deletions
diff --git a/docker/mariadb/mariadb-clustercheck/Dockerfile.j2 b/docker/mariadb/mariadb-clustercheck/Dockerfile.j2 index 1aa8aa13a..8068186db 100644 --- a/docker/mariadb/mariadb-clustercheck/Dockerfile.j2 +++ b/docker/mariadb/mariadb-clustercheck/Dockerfile.j2 @@ -6,8 +6,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block mariadb_clustercheck_header %}{% endblock %} 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 +RUN chmod 644 /usr/local/bin/kolla_extend_start && \ + chmod 755 /usr/local/bin/socat_wrapper {% block mariadb_clustercheck_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/mariadb/mariadb-clustercheck/socat_wrapper.sh b/docker/mariadb/mariadb-clustercheck/socat_wrapper.sh new file mode 100644 index 000000000..bf562e3d5 --- /dev/null +++ b/docker/mariadb/mariadb-clustercheck/socat_wrapper.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +catch_term() { + kill -TERM "$child" 2>/dev/null + exit 0 +} + +catch_quit() { + kill -QUIT "$child" 2>/dev/null + exit 0 +} + +trap catch_term SIGTERM +trap catch_quit SIGQUIT + +socat "$@" & + +child=$! +wait "$child" |