chore(builder): add debug, move confd loop before daemon execs

Author: Gabriel Monroy

builder/bin/boot

@@ -3,14 +3,17 @@
 # This script is designed to be run inside the container
 #
 
+# fail hard and fast even on pipelines
+set -eo pipefail
+
+# set debug based on envvar
+[[ $DEBUG ]] && set -x
+
 # configure etcd
 export ETCD=${ETCD:-172.17.42.1:4001}
 export ETCD_PATH=${ETCD_PATH:-/deis/builder}
 export ETCD_TTL=${ETCD_TTL:-10}
 
-# fail hard and fast even on pipelines
-set -eo pipefail
-
 # wait for etcd to be available
 until etcdctl -C $ETCD ls >/dev/null; do
 	echo "waiting for etcd at $ETCD..."
@@ -31,6 +34,10 @@ until confd -onetime -node $ETCD -config-file /app/confd.toml; do
 	sleep $(($ETCD_TTL/2))  # sleep for half the TTL
 done
 
+# spawn confd in the background to update services based on etcd changes
+confd -node $ETCD -config-file /app/confd.toml &
+CONFD_PID=$!
+
 # remove any pre-existing docker.sock
 test -e /var/run/docker.sock && rm -f /var/run/docker.sock
 
@@ -58,10 +65,6 @@ function on_exit() {
 }
 trap on_exit INT TERM EXIT
 
-# spawn confd in the background to update services based on etcd changes
-confd -node $ETCD -config-file /app/confd.toml &
-CONFD_PID=$!
-
 # publish the service to etcd using the injected HOST and PORT
 if [[ ! -z $PUBLISH ]]; then
 

builder/conf.d/authorized_keys.toml

@@ -6,6 +6,4 @@ git = 1000
 mode  = "0600"
 keys = [
   "/deis/builder/users",
-]
-#check_cmd  = "cat {{ .src }}"
-#reload_cmd = "/usr/sbin/service nginx restart"
+]