diff --git a/hack/docker/haproxy/1.7.2/setup.sh b/hack/docker/haproxy/1.7.2/setup.sh index a10b438c9..0ec288365 100755 --- a/hack/docker/haproxy/1.7.2/setup.sh +++ b/hack/docker/haproxy/1.7.2/setup.sh @@ -16,7 +16,7 @@ TAG=1.7.2-$TAG build() { pushd $(dirname "${BASH_SOURCE}") - wget -O kloader https://cdn.appscode.com/binaries/kloader/1.5.0/kloader-linux-amd64 + wget -O kloader https://cdn.appscode.com/binaries/kloader/1.5.1/kloader-linux-amd64 chmod +x kloader local cmd="docker build -t appscode/$IMG:$TAG ." echo $cmd; $cmd diff --git a/hack/docker/haproxy/1.7.5/runit.sh b/hack/docker/haproxy/1.7.5/runit.sh index d465341eb..36cafefab 100755 --- a/hack/docker/haproxy/1.7.5/runit.sh +++ b/hack/docker/haproxy/1.7.5/runit.sh @@ -23,5 +23,11 @@ do cat $dir/tls.key >> $CERT_DIR/$secret.pem done +echo "Checking HAProxy configuration ..." +cmd="exec /kloader check $KLOADER_ARGS" +echo $cmd +$cmd +rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi + echo "Starting runit..." exec /usr/sbin/runsvdir-start diff --git a/hack/docker/haproxy/1.7.5/setup.sh b/hack/docker/haproxy/1.7.5/setup.sh index ab2db3b7e..e547b152b 100755 --- a/hack/docker/haproxy/1.7.5/setup.sh +++ b/hack/docker/haproxy/1.7.5/setup.sh @@ -16,7 +16,7 @@ TAG=1.7.5-$TAG build() { pushd $(dirname "${BASH_SOURCE}") - wget -O kloader https://cdn.appscode.com/binaries/kloader/1.5.0/kloader-linux-amd64 + wget -O kloader https://cdn.appscode.com/binaries/kloader/1.5.1/kloader-linux-amd64 chmod +x kloader local cmd="docker build -t appscode/$IMG:$TAG ." echo $cmd; $cmd diff --git a/hack/docker/haproxy/1.7.5/sv/reloader/run b/hack/docker/haproxy/1.7.5/sv/reloader/run index bbe5bfeb7..0d5b9dcc2 100755 --- a/hack/docker/haproxy/1.7.5/sv/reloader/run +++ b/hack/docker/haproxy/1.7.5/sv/reloader/run @@ -4,6 +4,6 @@ exec 2> >(logger -s -p daemon.error -t ${PWD##*/}) source /etc/envvars echo "Starting HAProxy configuration watcher and reloader ..." -cmd="exec /kloader $KLOADER_ARGS" +cmd="exec /kloader run $KLOADER_ARGS" echo $cmd $cmd