Skip to content

Commit 4a56691

Browse files
author
Matthew Fisher
committed
fix(deisctl): add timeoutstartsec to logspout
1 parent ceadf34 commit 4a56691

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

deisctl/units/deis-logspout.service

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ After=docker.socket etcd.service
55

66
[Service]
77
EnvironmentFile=/etc/environment
8+
TimeoutStartSec=20m
89
ExecStartPre=/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/logspout`; docker history $IMAGE >/dev/null || docker pull $IMAGE"
910
ExecStartPre=/bin/sh -c "docker inspect deis-logspout >/dev/null && docker rm -f deis-logspout || true"
1011
ExecStart=/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/logspout` && docker run --name deis-logspout --rm -v /var/run/docker.sock:/tmp/docker.sock -e ETCD_HOST=$COREOS_PRIVATE_IPV4 -e HOST=$COREOS_PRIVATE_IPV4 -e DEBUG=1 $IMAGE"

0 commit comments

Comments
 (0)