Use kloader 1.5.1 and check config before starting runit. (#140)

voyagermesh · Jun 2, 2017 · dd107b0 · dd107b0
1 parent b00fe77
commit dd107b0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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