Merge pull request #2747 from bacongobbler/cache-images

fix(builder): delete images on destroy

Author: Matthew Fisher

builder/image/conf.d/check-repos.toml

@@ -6,6 +6,7 @@ gid = 0
 mode  = "0755"
 keys = [
   "/deis/services",
+  "/deis/registry",
 ]
 reload_cmd = "/home/git/check-repos"
 check_cmd = "/app/bin/check {{ .src }}"

builder/image/templates/builder

@@ -28,7 +28,7 @@ usage() {
 }
 
 parse-string(){
-    # helper to avoid the single quote escape 
+    # helper to avoid the single quote escape
     # occurred in command substitution
     local args=() idx=0 IFS=' ' c
     for c; do printf -v args[idx++] '%s ' "$c"; done
@@ -177,5 +177,6 @@ echo
 # cleanup
 cd $REPO_DIR
 git gc &>/dev/null
-[ $JOB ] && docker rm -f $JOB &>/dev/null
-docker rmi -f $TMP_IMAGE &>/dev/null || true
+if [ -n "$JOB" ]; then
+  docker rm -f $JOB &>/dev/null
+fi

builder/image/templates/check-repos

@@ -12,8 +12,12 @@ cd $(dirname $0) # absolute path
 for repo in *.git;
 do
     reponame="${repo%.*}"
+    appname="{{ .deis_registry_host }}:{{ .deis_registry_port }}/$reponame"
     if ! listcontains "{{ range $services := .deis_services }}{{ Base $services.Key }} {{ end }}" "$reponame";
     then
         rm -rf "$repo"
+        docker images | grep $appname | awk '{ print $3 }' | xargs docker rmi -f
+        # remove any dangling images left over from the cleanup
+        docker images --filter "dangling=true" | awk '{ print $3 }' | xargs docker rmi -f
     fi
 done