fix(builder): start after controller, block until running

deis-builder was reporting as running very quickly,
but inside the container slugrunner and slugbuilder were
taking many minutes to make the container actually active.

Here, we add an ExecStartPost to block a 'running' status
until we're listening on 2222.

We also start the controller before builder, as builder checks
for /deis/controller.

fixes #857

Author: carmstrong

Makefile

@@ -77,25 +77,27 @@ restart: stop start
 run: install start
 
 start: check-fleet
-	# registry logger cache database (router)
+	@# registry logger cache database (router)
+	$(call echo_yellow,"Starting Deis! Deis will be functional once all services are reported as running... ")
 	fleetctl --strict-host-key-checking=false start $(START_UNITS)
 	$(call echo_yellow,"Waiting for deis-registry to start (this can take some time)... ")
 	@until fleetctl --strict-host-key-checking=false list-units | egrep -q "deis-registry.+(running|failed|dead)"; do printf "\033[0;33mStatus:\033[0m "; fleetctl --strict-host-key-checking=false list-units | grep "registry" | awk '{printf $$3}'; printf "\r" ; sleep 10; done
 	$(call check_for_errors)
-	$(call echo_yellow,"Done! Waiting for deis-builder...")
 
-	# builder
-	fleetctl --strict-host-key-checking=false submit builder/systemd/*
-	fleetctl --strict-host-key-checking=false start builder/systemd/*
-	@until fleetctl --strict-host-key-checking=false list-units | egrep -q "deis-builder.+(running|failed|dead)"; do printf "\033[0;33mStatus:\033[0m "; fleetctl --strict-host-key-checking=false list-units | grep "builder" | awk '{printf $$3}'; printf "\r" ; sleep 10; done
-	$(call check_for_errors)
+	@# controller
 	$(call echo_yellow,"Done! Waiting for deis-controller...")
-
-	# controller
 	fleetctl --strict-host-key-checking=false submit controller/systemd/*
 	fleetctl --strict-host-key-checking=false start controller/systemd/*
 	@until fleetctl --strict-host-key-checking=false list-units | egrep -q "deis-controller.+(running|failed|dead)"; do printf "\033[0;33mStatus:\033[0m "; fleetctl --strict-host-key-checking=false list-units | grep "controller" | awk '{printf $$3}'; printf "\r" ; sleep 10; done
+
+	@# builder
+	$(call echo_yellow,"Done! Waiting for deis-builder to start (this can also take some time)... ")
+	fleetctl --strict-host-key-checking=false submit builder/systemd/*
+	fleetctl --strict-host-key-checking=false start builder/systemd/*
+	@until fleetctl --strict-host-key-checking=false list-units | egrep -q "deis-builder.+(running|failed|dead)"; do printf "\033[0;33mStatus:\033[0m "; fleetctl --strict-host-key-checking=false list-units | grep "builder" | awk '{printf $$3}'; printf "\r" ; sleep 10; done
 	$(call check_for_errors)
+
+	@# router
 	@if [ "$$SKIP_ROUTER" = true ]; then \
 		echo "\033[0;33mYou'll need to configure DNS and start the router manually for multi-node clusters.\033[0m" ; \
 		echo "\033[0;33mRun 'make start-router' to schedule and start deis-router.\033[0m" ; \

builder/systemd/deis-builder.service

@@ -1,18 +1,19 @@
 [Unit]
 Description=deis-builder
+Requires=deis-controller.service
+After=deis-controller.service
 
 [Service]
 EnvironmentFile=/etc/environment
 TimeoutStartSec=20m
 ExecStartPre=/bin/sh -c "/usr/bin/docker history deis/builder >/dev/null || /usr/bin/docker pull deis/builder"
 ExecStartPre=/bin/bash -c "/usr/bin/docker start deis-builder-data || /usr/bin/docker run --name deis-builder-data -v /var/lib/docker deis/base /bin/true"
 ExecStart=/bin/sh -c "docker run --name deis-builder -p 2222:22 -e PUBLISH=22 -e HOST=$COREOS_PRIVATE_IPV4 -e PORT=2222 --volumes-from deis-builder-data --privileged deis/builder"
+ExecStartPost=/bin/sh -c "echo 'Waiting for builder on 2222/tcp...' && until cat </dev/null>/dev/tcp/$COREOS_PRIVATE_IPV4/2222; do sleep 1; done"
 ExecStop=/usr/bin/docker rm -f deis-builder
 
 [Install]
 WantedBy=multi-user.target
 
-# We only need this so that when we start controller, it's guaranteed to be scheduled
-# (If logger and builder are on separate machines, controller can never be scheduled)
 [X-Fleet]
-X-ConditionMachineOf=deis-logger.service
+X-ConditionMachineOf=deis-controller.service

controller/systemd/deis-controller.service

@@ -1,7 +1,7 @@
 [Unit]
 Description=deis-controller
-Requires=deis-logger.service deis-builder.service
-After=deis-logger.service deis-builder.service
+Requires=deis-logger.service
+After=deis-logger.service
 
 [Service]
 EnvironmentFile=/etc/environment
@@ -15,4 +15,3 @@ WantedBy=multi-user.target
 
 [X-Fleet]
 X-ConditionMachineOf=deis-logger.service
-X-ConditionMachineOf=deis-builder.service