ref(controller): use host's Docker graph

Author: mboersma

controller/bin/boot

@@ -81,6 +81,11 @@ cd /app
 mkdir -p /data/logs
 chmod 777 /data/logs
 
+# allow deis user permission to Docker
+if addgroup -g "$(stat -c "%g" /var/run/docker.sock)" docker; then
+	addgroup deis docker
+fi
+
 # run an idempotent database migration
 sudo -E -u deis ./manage.py syncdb --migrate --noinput
 

controller/tests/controller_test.go

@@ -49,6 +49,7 @@ func TestController(t *testing.T) {
 		err = dockercli.RunContainer(cli,
 			"--name", name,
 			"--rm",
+			"-v", "/var/run/docker.sock:/var/run/docker.sock",
 			"-v", "/var/run/fleet.sock:/var/run/fleet.sock",
 			"-p", port+":8000",
 			"-e", "EXTERNAL_PORT="+port,

deisctl/units/deis-controller.service

@@ -1,14 +1,14 @@
 [Unit]
 Description=deis-controller
-Requires=fleet.socket
-After=fleet.socket
+Requires=docker.socket fleet.socket
+After=docker.socket fleet.socket
 
 [Service]
 EnvironmentFile=/etc/environment
 TimeoutStartSec=20m
 ExecStartPre=/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/controller` && docker history $IMAGE >/dev/null 2>&1 || flock -w 1200 /var/run/lock/alpine-pull docker pull $IMAGE"
 ExecStartPre=/bin/sh -c "docker inspect deis-controller >/dev/null 2>&1 && docker rm -f deis-controller || true"
-ExecStart=/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/controller` && docker run --name deis-controller --rm -p 8000:8000 -e EXTERNAL_PORT=8000 -e HOST=$COREOS_PRIVATE_IPV4 -v /var/run/fleet.sock:/var/run/fleet.sock $IMAGE"
+ExecStart=/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/controller` && docker run --name deis-controller --rm -p 8000:8000 -e EXTERNAL_PORT=8000 -e HOST=$COREOS_PRIVATE_IPV4 -v /var/run/docker.sock:/var/run/docker.sock -v /var/run/fleet.sock:/var/run/fleet.sock $IMAGE"
 ExecStop=-/usr/bin/docker stop deis-controller
 Restart=on-failure
 RestartSec=5