Skip to content

Commit 1dadb72

Browse files
committed
Merge pull request #3625 from mboersma/quieter-builder-startup
fix(builder): silence pipefail errors on boot
2 parents 86cccf4 + 95a94f6 commit 1dadb72

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

deisctl/units/deis-builder.service

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ExecStartPre=/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/builder` && docker
99
ExecStartPre=/bin/sh -c "docker inspect deis-builder >/dev/null 2>&1 && docker rm -f deis-builder || true"
1010
ExecStartPre=-/bin/sh -c "/sbin/losetup -f"
1111
ExecStart=/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/builder` && docker run --name deis-builder --rm -p 2223:22 --volumes-from=deis-builder-data -c 800 -e EXTERNAL_PORT=2223 -e HOST=$COREOS_PRIVATE_IPV4 --privileged -v /etc/environment_proxy:/etc/environment_proxy $IMAGE"
12-
ExecStartPost=/bin/sh -c "echo 'Waiting for builder on 2223/tcp...' && until echo 'dummy-value' | ncat $COREOS_PRIVATE_IPV4 2223 >/dev/null 2>&1; do sleep 1; done"
12+
ExecStartPost=/bin/sh -c "echo 'Waiting for builder on 2223/tcp...' && until ncat $COREOS_PRIVATE_IPV4 2223 --exec '/usr/bin/echo dummy-value' >/dev/null 2>&1; do sleep 1; done"
1313
ExecStartPost=/usr/bin/docker exec deis-builder /usr/local/bin/push-images
1414
ExecStopPost=-/usr/bin/docker rm -f deis-builder
1515
Restart=on-failure

0 commit comments

Comments
 (0)