fix(builder): check etcd dir itself before deleting repo

Author: mboersma

builder/rootfs/bin/boot

@@ -77,10 +77,14 @@ docker build -t deis/slugrunner /usr/local/src/slugrunner/
 /usr/sbin/sshd -D -e &
 SSHD_PID=$!
 
+# start a cleanup script to remote old repositories and images
+/bin/cleanup &
+CLEANUP_PID=$!
+
 # smart shutdown on SIGINT and SIGTERM
 function on_exit() {
-	kill -TERM $DOCKER_PID $SSHD_PID
-	wait $DOCKER_PID $SSHD_PID 2>/dev/null
+	kill -TERM $DOCKER_PID $SSHD_PID $CLEANUP_PID
+	wait $DOCKER_PID $SSHD_PID $CLEANUP_PID 2>/dev/null
 	exit 0
 }
 trap on_exit INT TERM EXIT

builder/rootfs/bin/cleanup

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+export ETCD=${ETCD:-$HOST:4001}
+
+while true
+do
+    etcdctl -C $ETCD watch --recursive /deis/services
+    /home/git/check-repos
+done

builder/rootfs/etc/confd/conf.d/check-repos.toml

@@ -5,7 +5,5 @@ uid = 0
 gid = 0
 mode  = "0755"
 keys = [
-  "/deis/services",
   "/deis/registry",
 ]
-reload_cmd = "/home/git/check-repos"

builder/rootfs/etc/confd/templates/check-repos

@@ -1,21 +1,16 @@
 #!/usr/bin/env bash
 
-listcontains() {
-    for word in $1; do
-        [[ $word = $2 ]] && return 0
-    done
-    return 1
-}
+export ETCD=${ETCD:-$HOST:4001}
 
 cd $(dirname $0) # absolute path
 
-for repo in *.git;
+for repo in *.git
 do
     reponame="${repo%.*}"
-    appname="{{ getv "/deis/registry/host" }}:{{ getv "/deis/registry/port" }}/$reponame"
-    if ! listcontains "{{ join (lsdir "/deis/services/*") " " }}" "$reponame";
+    if ! etcdctl -C $ETCD ls /deis/services/"$reponame" > /dev/null 2>&1
     then
         rm -rf "$repo"
+        appname="{{ getv "/deis/registry/host" }}:{{ getv "/deis/registry/port" }}/$reponame"
         docker images | grep $appname | awk '{ print $3 }' | xargs -r docker rmi -f
         # remove any dangling images left over from the cleanup
         docker images --filter "dangling=true" | awk '{ print $3 }' | grep -v IMAGE | xargs -r docker rmi -f