From c4e5aad8e303cdf6911e944b667ee2ef69caaa25 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 21 Nov 2017 14:32:42 -0800 Subject: [PATCH] Add "-W" (and "-db") unilaterally via entrypoint --- 1.4/alpine/docker-entrypoint.sh | 7 +++++++ 1.4/docker-entrypoint.sh | 7 +++++++ 1.5/alpine/docker-entrypoint.sh | 6 ++++-- 1.5/docker-entrypoint.sh | 6 ++++-- 1.6/alpine/docker-entrypoint.sh | 6 ++++-- 1.6/docker-entrypoint.sh | 6 ++++-- 1.7/alpine/docker-entrypoint.sh | 6 ++++-- 1.7/docker-entrypoint.sh | 6 ++++-- 1.8-rc/Dockerfile | 2 +- 1.8-rc/alpine/Dockerfile | 2 +- 1.8-rc/alpine/docker-entrypoint.sh | 8 ++++++++ 1.8-rc/docker-entrypoint.sh | 8 ++++++++ 12 files changed, 56 insertions(+), 14 deletions(-) diff --git a/1.4/alpine/docker-entrypoint.sh b/1.4/alpine/docker-entrypoint.sh index 06c4dfa..34174c6 100755 --- a/1.4/alpine/docker-entrypoint.sh +++ b/1.4/alpine/docker-entrypoint.sh @@ -6,4 +6,11 @@ if [ "${1#-}" != "$1" ]; then set -- haproxy "$@" fi +if [ "$1" = 'haproxy' ]; then + shift # "haproxy" + # if the user wants "haproxy", let's add a couple useful flags + # -db -- disables background mode + set -- haproxy -db "$@" +fi + exec "$@" diff --git a/1.4/docker-entrypoint.sh b/1.4/docker-entrypoint.sh index 06c4dfa..34174c6 100755 --- a/1.4/docker-entrypoint.sh +++ b/1.4/docker-entrypoint.sh @@ -6,4 +6,11 @@ if [ "${1#-}" != "$1" ]; then set -- haproxy "$@" fi +if [ "$1" = 'haproxy' ]; then + shift # "haproxy" + # if the user wants "haproxy", let's add a couple useful flags + # -db -- disables background mode + set -- haproxy -db "$@" +fi + exec "$@" diff --git a/1.5/alpine/docker-entrypoint.sh b/1.5/alpine/docker-entrypoint.sh index 1b413a9..0e94d30 100755 --- a/1.5/alpine/docker-entrypoint.sh +++ b/1.5/alpine/docker-entrypoint.sh @@ -7,9 +7,11 @@ if [ "${1#-}" != "$1" ]; then 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 "$@" + # if the user wants "haproxy", let's add a couple useful flags + # haproxy-systemd-wrapper -- "master-worker mode" (similar to the new "-W" flag; allows for reload via "SIGUSR2") + # -db -- disables background mode + set -- "$(which haproxy-systemd-wrapper)" -p /run/haproxy.pid -db "$@" fi exec "$@" diff --git a/1.5/docker-entrypoint.sh b/1.5/docker-entrypoint.sh index 1b413a9..0e94d30 100755 --- a/1.5/docker-entrypoint.sh +++ b/1.5/docker-entrypoint.sh @@ -7,9 +7,11 @@ if [ "${1#-}" != "$1" ]; then 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 "$@" + # if the user wants "haproxy", let's add a couple useful flags + # haproxy-systemd-wrapper -- "master-worker mode" (similar to the new "-W" flag; allows for reload via "SIGUSR2") + # -db -- disables background mode + set -- "$(which haproxy-systemd-wrapper)" -p /run/haproxy.pid -db "$@" fi exec "$@" diff --git a/1.6/alpine/docker-entrypoint.sh b/1.6/alpine/docker-entrypoint.sh index 1b413a9..0e94d30 100755 --- a/1.6/alpine/docker-entrypoint.sh +++ b/1.6/alpine/docker-entrypoint.sh @@ -7,9 +7,11 @@ if [ "${1#-}" != "$1" ]; then 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 "$@" + # if the user wants "haproxy", let's add a couple useful flags + # haproxy-systemd-wrapper -- "master-worker mode" (similar to the new "-W" flag; allows for reload via "SIGUSR2") + # -db -- disables background mode + set -- "$(which haproxy-systemd-wrapper)" -p /run/haproxy.pid -db "$@" fi exec "$@" diff --git a/1.6/docker-entrypoint.sh b/1.6/docker-entrypoint.sh index 1b413a9..0e94d30 100755 --- a/1.6/docker-entrypoint.sh +++ b/1.6/docker-entrypoint.sh @@ -7,9 +7,11 @@ if [ "${1#-}" != "$1" ]; then 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 "$@" + # if the user wants "haproxy", let's add a couple useful flags + # haproxy-systemd-wrapper -- "master-worker mode" (similar to the new "-W" flag; allows for reload via "SIGUSR2") + # -db -- disables background mode + set -- "$(which haproxy-systemd-wrapper)" -p /run/haproxy.pid -db "$@" fi exec "$@" diff --git a/1.7/alpine/docker-entrypoint.sh b/1.7/alpine/docker-entrypoint.sh index 1b413a9..0e94d30 100755 --- a/1.7/alpine/docker-entrypoint.sh +++ b/1.7/alpine/docker-entrypoint.sh @@ -7,9 +7,11 @@ if [ "${1#-}" != "$1" ]; then 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 "$@" + # if the user wants "haproxy", let's add a couple useful flags + # haproxy-systemd-wrapper -- "master-worker mode" (similar to the new "-W" flag; allows for reload via "SIGUSR2") + # -db -- disables background mode + set -- "$(which haproxy-systemd-wrapper)" -p /run/haproxy.pid -db "$@" fi exec "$@" diff --git a/1.7/docker-entrypoint.sh b/1.7/docker-entrypoint.sh index 1b413a9..0e94d30 100755 --- a/1.7/docker-entrypoint.sh +++ b/1.7/docker-entrypoint.sh @@ -7,9 +7,11 @@ if [ "${1#-}" != "$1" ]; then 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 "$@" + # if the user wants "haproxy", let's add a couple useful flags + # haproxy-systemd-wrapper -- "master-worker mode" (similar to the new "-W" flag; allows for reload via "SIGUSR2") + # -db -- disables background mode + set -- "$(which haproxy-systemd-wrapper)" -p /run/haproxy.pid -db "$@" fi exec "$@" diff --git a/1.8-rc/Dockerfile b/1.8-rc/Dockerfile index c9967f9..f77ee69 100644 --- a/1.8-rc/Dockerfile +++ b/1.8-rc/Dockerfile @@ -50,4 +50,4 @@ RUN set -x \ COPY docker-entrypoint.sh / ENTRYPOINT ["/docker-entrypoint.sh"] -CMD ["haproxy", "-W", "-db", "-f", "/usr/local/etc/haproxy/"] +CMD ["haproxy", "-f", "/usr/local/etc/haproxy/"] diff --git a/1.8-rc/alpine/Dockerfile b/1.8-rc/alpine/Dockerfile index b43f6d8..72c33e9 100644 --- a/1.8-rc/alpine/Dockerfile +++ b/1.8-rc/alpine/Dockerfile @@ -77,4 +77,4 @@ RUN set -x \ COPY docker-entrypoint.sh / ENTRYPOINT ["/docker-entrypoint.sh"] -CMD ["haproxy", "-W", "-db", "-f", "/usr/local/etc/haproxy/"] +CMD ["haproxy", "-f", "/usr/local/etc/haproxy/"] diff --git a/1.8-rc/alpine/docker-entrypoint.sh b/1.8-rc/alpine/docker-entrypoint.sh index 06c4dfa..8b2093b 100755 --- a/1.8-rc/alpine/docker-entrypoint.sh +++ b/1.8-rc/alpine/docker-entrypoint.sh @@ -6,4 +6,12 @@ if [ "${1#-}" != "$1" ]; then set -- haproxy "$@" fi +if [ "$1" = 'haproxy' ]; then + shift # "haproxy" + # if the user wants "haproxy", let's add a couple useful flags + # -W -- "master-worker mode" (similar to the old "haproxy-systemd-wrapper"; allows for reload via "SIGUSR2") + # -db -- disables background mode + set -- haproxy -W -db "$@" +fi + exec "$@" diff --git a/1.8-rc/docker-entrypoint.sh b/1.8-rc/docker-entrypoint.sh index 06c4dfa..8b2093b 100755 --- a/1.8-rc/docker-entrypoint.sh +++ b/1.8-rc/docker-entrypoint.sh @@ -6,4 +6,12 @@ if [ "${1#-}" != "$1" ]; then set -- haproxy "$@" fi +if [ "$1" = 'haproxy' ]; then + shift # "haproxy" + # if the user wants "haproxy", let's add a couple useful flags + # -W -- "master-worker mode" (similar to the old "haproxy-systemd-wrapper"; allows for reload via "SIGUSR2") + # -db -- disables background mode + set -- haproxy -W -db "$@" +fi + exec "$@"