From f0d2bb10b36374315e67dfe317ef29119e778f25 Mon Sep 17 00:00:00 2001 From: Kristian Klausen Date: Sun, 6 Mar 2016 20:09:47 +0100 Subject: [PATCH] Add reload support Fix #5 --- 1.4/Dockerfile | 2 ++ 1.4/docker-entrypoint.sh | 9 +++++++++ 1.5/Dockerfile | 2 ++ 1.5/docker-entrypoint.sh | 15 +++++++++++++++ 1.6/Dockerfile | 2 ++ 1.6/docker-entrypoint.sh | 15 +++++++++++++++ 6 files changed, 45 insertions(+) create mode 100755 1.4/docker-entrypoint.sh create mode 100755 1.5/docker-entrypoint.sh create mode 100755 1.6/docker-entrypoint.sh diff --git a/1.4/Dockerfile b/1.4/Dockerfile index e184c01..cc09d18 100644 --- a/1.4/Dockerfile +++ b/1.4/Dockerfile @@ -27,4 +27,6 @@ RUN buildDeps='curl gcc libc6-dev libpcre3-dev libssl-dev make' \ && rm -rf /usr/src/haproxy \ && apt-get purge -y --auto-remove $buildDeps +COPY docker-entrypoint.sh / +ENTRYPOINT ["/docker-entrypoint.sh"] CMD ["haproxy", "-f", "/usr/local/etc/haproxy/haproxy.cfg"] diff --git a/1.4/docker-entrypoint.sh b/1.4/docker-entrypoint.sh new file mode 100755 index 0000000..cb8b89c --- /dev/null +++ b/1.4/docker-entrypoint.sh @@ -0,0 +1,9 @@ +#!/bin/bash +set -eo pipefail + +# first arg is `-f` or `--some-option` +if [ "${1:0:1}" = '-' ]; then + set -- haproxy "$@" +fi + +exec "$@" diff --git a/1.5/Dockerfile b/1.5/Dockerfile index eb32b28..8c98a07 100644 --- a/1.5/Dockerfile +++ b/1.5/Dockerfile @@ -27,4 +27,6 @@ RUN buildDeps='curl gcc libc6-dev libpcre3-dev libssl-dev make' \ && rm -rf /usr/src/haproxy \ && apt-get purge -y --auto-remove $buildDeps +COPY docker-entrypoint.sh / +ENTRYPOINT ["/docker-entrypoint.sh"] CMD ["haproxy", "-f", "/usr/local/etc/haproxy/haproxy.cfg"] diff --git a/1.5/docker-entrypoint.sh b/1.5/docker-entrypoint.sh new file mode 100755 index 0000000..e242db2 --- /dev/null +++ b/1.5/docker-entrypoint.sh @@ -0,0 +1,15 @@ +#!/bin/bash +set -eo pipefail + +# first arg is `-f` or `--some-option` +if [ "${1:0:1}" = '-' ]; then + set -- haproxy "$@" +fi + +if [ "$1" = 'haproxy' ]; then + # if the user wants "haproxy", let's use "haproxy-systemd-wrapper" instead so we can have proper reloadability implemented by upstream + shift # "haproxy" + set -- "$(which haproxy-systemd-wrapper)" -p /run/haproxy.pid "$@" +fi + +exec "$@" diff --git a/1.6/Dockerfile b/1.6/Dockerfile index fbcae43..f01fc30 100644 --- a/1.6/Dockerfile +++ b/1.6/Dockerfile @@ -27,4 +27,6 @@ RUN buildDeps='curl gcc libc6-dev libpcre3-dev libssl-dev make' \ && rm -rf /usr/src/haproxy \ && apt-get purge -y --auto-remove $buildDeps +COPY docker-entrypoint.sh / +ENTRYPOINT ["/docker-entrypoint.sh"] CMD ["haproxy", "-f", "/usr/local/etc/haproxy/haproxy.cfg"] diff --git a/1.6/docker-entrypoint.sh b/1.6/docker-entrypoint.sh new file mode 100755 index 0000000..e242db2 --- /dev/null +++ b/1.6/docker-entrypoint.sh @@ -0,0 +1,15 @@ +#!/bin/bash +set -eo pipefail + +# first arg is `-f` or `--some-option` +if [ "${1:0:1}" = '-' ]; then + set -- haproxy "$@" +fi + +if [ "$1" = 'haproxy' ]; then + # if the user wants "haproxy", let's use "haproxy-systemd-wrapper" instead so we can have proper reloadability implemented by upstream + shift # "haproxy" + set -- "$(which haproxy-systemd-wrapper)" -p /run/haproxy.pid "$@" +fi + +exec "$@"