Skip to content
This repository has been archived by the owner on Nov 30, 2021. It is now read-only.

Commit

Permalink
chore(*): remove deis-builder-data
Browse files Browse the repository at this point in the history
  • Loading branch information
carmstrong committed Sep 26, 2014
1 parent 0c025a0 commit ccb48ae
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 25 deletions.
3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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...
[email protected]: loaded
Expand All @@ -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...
[email protected]: running
Expand Down Expand Up @@ -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
[email protected] f936b7a5.../172.17.8.100 loaded active running
[email protected] f936b7a5.../172.17.8.100 loaded active running
[email protected] f936b7a5.../172.17.8.100 loaded active running
Expand Down
2 changes: 0 additions & 2 deletions cmd/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ var (
"database-data",
"registry-data",
"logger-data",
"builder-data",
}
)

Expand Down Expand Up @@ -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",
Expand Down
14 changes: 0 additions & 14 deletions units/deis-builder-data.service

This file was deleted.

7 changes: 1 addition & 6 deletions units/deis-builder.service
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit ccb48ae

Please sign in to comment.