Issue #86 remove VIP upon stop - haproxy-keepalived

instantlinux · Aug 22, 2023 · 453cb67 · 453cb67
1 parent e971c64
commit 453cb67
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/images/haproxy-keepalived/Dockerfile b/images/haproxy-keepalived/Dockerfile
@@ -1,4 +1,4 @@
-FROM haproxy:2.8.1-alpine
+FROM haproxy:2.8.2-alpine
 MAINTAINER Rich Braun "[email protected]"
 ARG BUILD_DATE
 ARG VCS_REF

diff --git a/images/haproxy-keepalived/docker-compose.yml b/images/haproxy-keepalived/docker-compose.yml
@@ -8,6 +8,7 @@ services:
     environment:
       KEEPALIVE_CONFIG_ID: ${KEEPALIVED_CONFIG_ID:-main}
       TZ: ${TZ:-UTC}
+    stop_signal: SIGTERM
     volumes:
     - ${ADMIN_PATH:-/opt}/haproxy/etc:/usr/local/etc/haproxy.d:ro
     - ${ADMIN_PATH:-/opt}/keepalived/etc/keepalived.conf:/etc/keepalived/keepalived.conf:ro

diff --git a/images/haproxy-keepalived/entrypoint.sh b/images/haproxy-keepalived/entrypoint.sh
@@ -1,5 +1,11 @@
 #!/bin/sh -e
 
+function graceful_stop() {
+    echo "Received SIGTERM"
+    kill -SIGTERM $(cat /run/keepalived/*.pid)
+    exit 0
+}
+
 if [ -s /run/secrets/$STATS_SECRET ]; then
   STATS_PASSWORD=$(cat /run/secrets/$STATS_SECRET)
 else
@@ -60,6 +66,9 @@ rm -f /run/rsyslogd.pid && rsyslogd
 if ! keepalived -i $KEEPALIVE_CONFIG_ID; then
   echo keepalived did not start, needs working /etc/keepalived/keepalived.conf
 fi
+trap graceful_stop SIGTERM
+
 sleep 10
 haproxy -f $HAPROXY_PATH/haproxy.cfg $CMD_OPTS || true
-tail +1 -f /var/log/messages
+tail +1 -f /var/log/messages &
+wait
diff --git a/images/haproxy-keepalived/helm/Chart.yaml b/images/haproxy-keepalived/helm/Chart.yaml
@@ -7,8 +7,8 @@ sources:
 - https://github.com/haproxy/haproxy
 - https://github.com/acassen/keepalived
 type: application
-version: 0.1.11
-appVersion: "2.8.1-alpine-2.2.8-r0"
+version: 0.1.12
+appVersion: "2.8.2-alpine-2.2.8-r0"
 dependencies:
 - name: chartlib
   version: 0.1.8