Merge pull request #105 from carmstrong/remove_builder_data

chore(*): remove deis-builder-data

Author: carmstrong

README.md

@@ -66,7 +66,6 @@ Scheduling data containers...
 deis-database-data.service: loaded
 deis-registry-data.service: loaded
 deis-logger-data.service: loaded
-deis-builder-data.service: loaded
 Data containers scheduled.
 Scheduling service containers...
 deis-database@1.service: loaded
@@ -89,7 +88,6 @@ Launching data containers...
 deis-database-data.service: exited
 deis-registry-data.service: exited
 deis-logger-data.service: exited
-deis-builder-data.service: exited
 Data containers launched.
 Launching service containers...
 deis-logger@1.service: running
@@ -146,7 +144,6 @@ The `deisctl` tool provides a number of other commands, including:
 ```console
 $ deisctl list
 UNIT				MACHINE				LOAD	ACTIVE	SUB
-deis-builder-data.service	f936b7a5.../172.17.8.100	loaded	active	exited
 deis-builder@1.service		f936b7a5.../172.17.8.100	loaded	active	running
 deis-cache@1.service		f936b7a5.../172.17.8.100	loaded	active	running
 deis-controller@1.service	f936b7a5.../172.17.8.100	loaded	active	running

cmd/cmd.go

@@ -28,7 +28,6 @@ var (
 		"database-data",
 		"registry-data",
 		"logger-data",
-		"builder-data",
 	}
 )
 
@@ -301,7 +300,6 @@ Options:
 	tag := args["--tag"].(string)
 	units := []string{
 		"deis-builder.service",
-		"deis-builder-data.service",
 		"deis-cache.service",
 		"deis-controller.service",
 		"deis-database.service",

units/deis-builder-data.service

@@ -1,19 +1,14 @@
 [Unit]
 Description=deis-builder
-Requires=deis-builder-data.service
-After=deis-builder-data.service
 
 [Service]
 EnvironmentFile=/etc/environment
 TimeoutStartSec=30m
 ExecStartPre=/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/builder`; docker history $IMAGE >/dev/null || docker pull $IMAGE"
 ExecStartPre=/bin/sh -c "docker inspect deis-builder >/dev/null && docker rm -f deis-builder || true"
-ExecStart=/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/builder` && docker run --name deis-builder --rm -p 2223:22 -e PUBLISH=22 -e HOST=$COREOS_PRIVATE_IPV4 -e PORT=2223 --volumes-from deis-builder-data --privileged $IMAGE"
+ExecStart=/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/builder` && docker run --name deis-builder --rm -p 2223:22 -e PUBLISH=22 -e HOST=$COREOS_PRIVATE_IPV4 -e PORT=2223 --privileged $IMAGE"
 ExecStartPost=/bin/sh -c "echo 'Waiting for builder on 2223/tcp...' && until /bin/sh -c \"cat </dev/null>/dev/tcp/$COREOS_PRIVATE_IPV4/2223\" >/dev/null 2>&1; do sleep 1; done"
 ExecStopPost=/usr/bin/docker stop deis-builder
 
 [Install]
 WantedBy=multi-user.target
-
-[X-Fleet]
-MachineOf=deis-builder-data.service