From 063fd36e2ae3b9770bb067f43080f3daeb7cfa1c Mon Sep 17 00:00:00 2001 From: "Joseph C. Sible" Date: Sat, 25 Aug 2018 19:47:29 -0400 Subject: [PATCH] Stop with SIGUSR1 To stop haproxy gracefully, SIGUSR1 is required. Currently, we just use SIGTERM, which is a hard stop. --- 1.5/Dockerfile | 1 + 1.5/alpine/Dockerfile | 1 + 1.6/Dockerfile | 1 + 1.6/alpine/Dockerfile | 1 + 1.7/Dockerfile | 1 + 1.7/alpine/Dockerfile | 1 + 1.8/Dockerfile | 1 + 1.8/alpine/Dockerfile | 1 + Dockerfile-alpine.template | 1 + Dockerfile-debian.template | 1 + 10 files changed, 10 insertions(+) diff --git a/1.5/Dockerfile b/1.5/Dockerfile index ec54217..5e058a0 100644 --- a/1.5/Dockerfile +++ b/1.5/Dockerfile @@ -53,3 +53,4 @@ RUN set -x \ COPY docker-entrypoint.sh / ENTRYPOINT ["/docker-entrypoint.sh"] CMD ["haproxy", "-f", "/usr/local/etc/haproxy/haproxy.cfg"] +STOPSIGNAL SIGUSR1 diff --git a/1.5/alpine/Dockerfile b/1.5/alpine/Dockerfile index 0571901..0689eda 100644 --- a/1.5/alpine/Dockerfile +++ b/1.5/alpine/Dockerfile @@ -53,3 +53,4 @@ RUN set -x \ COPY docker-entrypoint.sh / ENTRYPOINT ["/docker-entrypoint.sh"] CMD ["haproxy", "-f", "/usr/local/etc/haproxy/haproxy.cfg"] +STOPSIGNAL SIGUSR1 diff --git a/1.6/Dockerfile b/1.6/Dockerfile index a07c33e..b4f6ee4 100644 --- a/1.6/Dockerfile +++ b/1.6/Dockerfile @@ -55,3 +55,4 @@ RUN set -x \ COPY docker-entrypoint.sh / ENTRYPOINT ["/docker-entrypoint.sh"] CMD ["haproxy", "-f", "/usr/local/etc/haproxy/haproxy.cfg"] +STOPSIGNAL SIGUSR1 diff --git a/1.6/alpine/Dockerfile b/1.6/alpine/Dockerfile index b3ac31a..dbbf82c 100644 --- a/1.6/alpine/Dockerfile +++ b/1.6/alpine/Dockerfile @@ -55,3 +55,4 @@ RUN set -x \ COPY docker-entrypoint.sh / ENTRYPOINT ["/docker-entrypoint.sh"] CMD ["haproxy", "-f", "/usr/local/etc/haproxy/haproxy.cfg"] +STOPSIGNAL SIGUSR1 diff --git a/1.7/Dockerfile b/1.7/Dockerfile index 69b02c7..48157ee 100644 --- a/1.7/Dockerfile +++ b/1.7/Dockerfile @@ -55,3 +55,4 @@ RUN set -x \ COPY docker-entrypoint.sh / ENTRYPOINT ["/docker-entrypoint.sh"] CMD ["haproxy", "-f", "/usr/local/etc/haproxy/haproxy.cfg"] +STOPSIGNAL SIGUSR1 diff --git a/1.7/alpine/Dockerfile b/1.7/alpine/Dockerfile index 3216645..6dd19e3 100644 --- a/1.7/alpine/Dockerfile +++ b/1.7/alpine/Dockerfile @@ -55,3 +55,4 @@ RUN set -x \ COPY docker-entrypoint.sh / ENTRYPOINT ["/docker-entrypoint.sh"] CMD ["haproxy", "-f", "/usr/local/etc/haproxy/haproxy.cfg"] +STOPSIGNAL SIGUSR1 diff --git a/1.8/Dockerfile b/1.8/Dockerfile index 0f6ce75..82b0113 100644 --- a/1.8/Dockerfile +++ b/1.8/Dockerfile @@ -55,3 +55,4 @@ RUN set -x \ COPY docker-entrypoint.sh / ENTRYPOINT ["/docker-entrypoint.sh"] CMD ["haproxy", "-f", "/usr/local/etc/haproxy/haproxy.cfg"] +STOPSIGNAL SIGUSR1 diff --git a/1.8/alpine/Dockerfile b/1.8/alpine/Dockerfile index b8010b8..e392514 100644 --- a/1.8/alpine/Dockerfile +++ b/1.8/alpine/Dockerfile @@ -55,3 +55,4 @@ RUN set -x \ COPY docker-entrypoint.sh / ENTRYPOINT ["/docker-entrypoint.sh"] CMD ["haproxy", "-f", "/usr/local/etc/haproxy/haproxy.cfg"] +STOPSIGNAL SIGUSR1 diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 383d69b..207269d 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -55,3 +55,4 @@ RUN set -x \ COPY docker-entrypoint.sh / ENTRYPOINT ["/docker-entrypoint.sh"] CMD ["haproxy", "-f", "/usr/local/etc/haproxy/haproxy.cfg"] +STOPSIGNAL SIGUSR1 diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index eb0178b..b49f489 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -55,3 +55,4 @@ RUN set -x \ COPY docker-entrypoint.sh / ENTRYPOINT ["/docker-entrypoint.sh"] CMD ["haproxy", "-f", "/usr/local/etc/haproxy/haproxy.cfg"] +STOPSIGNAL SIGUSR1