mirror of
https://github.com/docker-library/haproxy.git
synced 2026-11-20 21:29:04 +03:00
Add "-W" (and "-db") unilaterally via entrypoint
This commit is contained in:
1 parent
df342c672b
commit
c4e5aad8e3
12 files changed
+56
-14
No files matched your search
@@ -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 "$@"
|
||||
@@ -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 "$@"
|
||||
@@ -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 "$@"
|
||||
@@ -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 "$@"
|
||||
@@ -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 "$@"
|
||||
@@ -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 "$@"
|
||||
@@ -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 "$@"
|
||||
@@ -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 "$@"
|
||||
+1
-1
@@ -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/"]
|
||||
@@ -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/"]
|
||||
@@ -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 "$@"
|
||||
@@ -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 "$@"
|
||||
Reference in new issue
Block a user