File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ export ETCD_TTL=${ETCD_TTL:-10}
1717export STORAGE_DRIVER=${STORAGE_DRIVER:- btrfs}
1818
1919# wait for etcd to be available
20- until etcdctl --no-sync -C $ETCD ls > /dev/null; do
20+ until etcdctl --no-sync -C $ETCD ls > /dev/null 2>&1 ; do
2121 echo " waiting for etcd at $ETCD ..."
2222 sleep $(( $ETCD_TTL / 2 )) # sleep for half the TTL
2323done
Original file line number Diff line number Diff line change @@ -6,8 +6,8 @@ After=deis-builder-data.service
66[Service]
77EnvironmentFile =/etc/environment
88TimeoutStartSec =20m
9- ExecStartPre =/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/builder`; docker history $IMAGE >/dev/null || docker pull $IMAGE"
10- ExecStartPre =/bin/sh -c "docker inspect deis-builder >/dev/null && docker rm -f deis-builder || true"
9+ ExecStartPre =/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/builder`; docker history $IMAGE >/dev/null 2>&1 || docker pull $IMAGE"
10+ ExecStartPre =/bin/sh -c "docker inspect deis-builder >/dev/null 2>&1 && docker rm -f deis-builder || true"
1111ExecStart =/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"
1212ExecStartPost =/bin/sh -c "echo 'Waiting for builder on 2223/tcp...' && until cat </dev/null>/dev/tcp/$COREOS_PRIVATE_IPV4/2223; do sleep 1; done"
1313ExecStopPost =/usr/bin/docker stop deis-builder
Original file line number Diff line number Diff line change @@ -16,7 +16,7 @@ export ETCD_PATH=${ETCD_PATH:-/deis/cache}
1616export ETCD_TTL=${ETCD_TTL:- 10}
1717
1818# wait for etcd to be available
19- until etcdctl --no-sync -C $ETCD ls > /dev/null; do
19+ until etcdctl --no-sync -C $ETCD ls > /dev/null 2>&1 ; do
2020 echo " waiting for etcd at $ETCD ..."
2121 sleep $(( $ETCD_TTL / 2 )) # sleep for half the TTL
2222done
Original file line number Diff line number Diff line change @@ -4,8 +4,8 @@ Description=deis-cache
44[Service]
55EnvironmentFile =/etc/environment
66TimeoutStartSec =20m
7- ExecStartPre =/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/cache`; docker history $IMAGE >/dev/null || docker pull $IMAGE"
8- ExecStartPre =/bin/sh -c "docker inspect deis-cache >/dev/null && docker rm -f deis-cache || true"
7+ ExecStartPre =/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/cache`; docker history $IMAGE >/dev/null 2>&1 || docker pull $IMAGE"
8+ ExecStartPre =/bin/sh -c "docker inspect deis-cache >/dev/null 2>&1 && docker rm -f deis-cache || true"
99ExecStart =/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/cache` && docker run --name deis-cache --rm -p 6379:6379 -e PUBLISH=6379 -e HOST=$COREOS_PRIVATE_IPV4 $IMAGE"
1010ExecStopPost =/usr/bin/docker stop deis-cache
1111
Original file line number Diff line number Diff line change @@ -96,11 +96,11 @@ write_files:
9696 content: |
9797 #!/bin/bash
9898 # usage: get_image <component_path>
99- IMAGE=`etcdctl get $1/image`
99+ IMAGE=`etcdctl get $1/image 2>/dev/null `
100100
101101 # if no image was set in etcd, we use the default plus the release string
102102 if [ $? -ne 0 ]; then
103- RELEASE=`etcdctl get /deis/release`
103+ RELEASE=`etcdctl get /deis/release 2>/dev/null `
104104
105105 # if no release was set in etcd, use the default provisioned with the server
106106 if [ $? -ne 0 ]; then
Original file line number Diff line number Diff line change @@ -16,7 +16,7 @@ export ETCD_PATH=${ETCD_PATH:-/deis/controller}
1616export ETCD_TTL=${ETCD_TTL:- 10}
1717
1818# wait for etcd to be available
19- until etcdctl --no-sync -C $ETCD ls > /dev/null; do
19+ until etcdctl --no-sync -C $ETCD ls > /dev/null 2>&1 ; do
2020 echo " waiting for etcd at $ETCD ..."
2121 sleep $(( $ETCD_TTL / 2 )) # sleep for half the TTL
2222done
Original file line number Diff line number Diff line change @@ -6,8 +6,8 @@ After=deis-logger.service
66[Service]
77EnvironmentFile =/etc/environment
88TimeoutStartSec =20m
9- ExecStartPre =/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/controller`; docker history $IMAGE >/dev/null || docker pull $IMAGE"
10- ExecStartPre =/bin/sh -c "docker inspect deis-controller >/dev/null && docker rm -f deis-controller || true"
9+ ExecStartPre =/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/controller`; docker history $IMAGE >/dev/null 2>&1 || docker pull $IMAGE"
10+ ExecStartPre =/bin/sh -c "docker inspect deis-controller >/dev/null 2>&1 && docker rm -f deis-controller || true"
1111ExecStart =/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/controller` && docker run --name deis-controller --rm -p 8000:8000 -e PUBLISH=8000 -e HOST=$COREOS_PRIVATE_IPV4 --volumes-from=deis-logger $IMAGE"
1212ExecStopPost =/usr/bin/docker stop deis-controller
1313
Original file line number Diff line number Diff line change @@ -23,7 +23,7 @@ if [[ ! -d /var/lib/postgresql/9.3/main ]]; then
2323fi
2424
2525# wait for etcd to be available
26- until etcdctl --no-sync -C $ETCD ls > /dev/null; do
26+ until etcdctl --no-sync -C $ETCD ls > /dev/null 2>&1 ; do
2727 echo " waiting for etcd at $ETCD ..."
2828 sleep $(( $ETCD_TTL / 2 )) # sleep for half the TTL
2929done
Original file line number Diff line number Diff line change @@ -6,8 +6,8 @@ After=deis-database-data.service
66[Service]
77EnvironmentFile =/etc/environment
88TimeoutStartSec =20m
9- ExecStartPre =/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/database`; docker history $IMAGE >/dev/null || docker pull $IMAGE"
10- ExecStartPre =/bin/sh -c "docker inspect deis-database >/dev/null && docker rm -f deis-database || true"
9+ ExecStartPre =/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/database`; docker history $IMAGE >/dev/null 2>&1 || docker pull $IMAGE"
10+ ExecStartPre =/bin/sh -c "docker inspect deis-database >/dev/null 2>&1 && docker rm -f deis-database || true"
1111ExecStart =/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/database` && docker run --name deis-database --rm -p 5432:5432 -e PUBLISH=5432 -e HOST=$COREOS_PRIVATE_IPV4 --volumes-from deis-database-data $IMAGE"
1212ExecStop =/bin/bash -c "nsenter --pid --uts --mount --ipc --net --target $(docker inspect --format='{{ .State.Pid }}' deis-database) sudo service postgresql stop"
1313ExecStopPost =/usr/bin/docker stop deis-database
Original file line number Diff line number Diff line change @@ -6,8 +6,8 @@ After=deis-logger-data.service
66[Service]
77EnvironmentFile =/etc/environment
88TimeoutStartSec =20m
9- ExecStartPre =/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/logger`; docker history $IMAGE >/dev/null || docker pull $IMAGE"
10- ExecStartPre =/bin/sh -c "docker inspect deis-logger >/dev/null && docker rm -f deis-logger || true"
9+ ExecStartPre =/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/logger`; docker history $IMAGE >/dev/null 2>&1 || docker pull $IMAGE"
10+ ExecStartPre =/bin/sh -c "docker inspect deis-logger >/dev/null 2>&1 && docker rm -f deis-logger || true"
1111ExecStart =/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/logger` && docker run --name deis-logger --rm -p 514:514/udp -e PUBLISH=514 -e HOST=$COREOS_PRIVATE_IPV4 --volumes-from deis-logger-data $IMAGE"
1212ExecStopPost =/usr/bin/docker stop deis-logger
1313
You can’t perform that action at this time.
0 commit comments