Merge pull request #3517 from mboersma/back-to-confd-interval

fix(*): use "confd --interval 5" instead of "--watch"

Author: mboersma

builder/image/bin/boot

@@ -47,7 +47,7 @@ until confd -onetime -node $ETCD --confdir /app --log-level error; do
 done
 
 # spawn confd in the background to update services based on etcd changes
-confd -node $ETCD --confdir /app --log-level error --watch &
+confd -node $ETCD --confdir /app --log-level error --interval 5 &
 CONFD_PID=$!
 
 # remove any pre-existing docker.sock

controller/bin/boot

@@ -91,7 +91,7 @@ function on_exit() {
 trap on_exit TERM
 
 # spawn confd in the background to update services based on etcd changes
-confd -node $ETCD --confdir /app --log-level error --watch &
+confd -node $ETCD --confdir /app --log-level error --interval 5 &
 CONFD_PID=$!
 
 echo deis-controller running...

database/bin/boot

@@ -110,7 +110,7 @@ function on_exit() {
 trap on_exit INT TERM
 
 # spawn confd in the background to update services based on etcd changes
-confd -node $ETCD -confdir /app --log-level error --watch &
+confd -node $ETCD -confdir /app --log-level error --interval 5 &
 CONFD_PID=$!
 
 # wait for the service to become available

registry/bin/boot

@@ -67,7 +67,7 @@ function on_exit() {
 trap on_exit INT TERM
 
 # spawn confd in the background to update services based on etcd changes
-confd -node $ETCD --confdir /app --log-level error --watch &
+confd -node $ETCD --confdir /app --log-level error --interval 5 &
 CONFD_PID=$!
 
 echo deis-registry running...

store/admin/bin/boot

@@ -6,7 +6,7 @@
 ETCD_PORT=${ETCD_PORT:-4001}
 ETCD="$HOST:$ETCD_PORT"
 
-confd -node $ETCD --confdir /app --log-level error --watch &
+confd -node $ETCD --confdir /app --log-level error --interval 5 &
 
 # loop forever until the container is stopped
 while true; do

store/gateway/bin/boot

@@ -106,7 +106,7 @@ function on_exit() {
 trap on_exit INT TERM
 
 # spawn confd in the background to update services based on etcd changes
-confd -node $ETCD --confdir /app --log-level error --watch &
+confd -node $ETCD --confdir /app --log-level error --interval 5 &
 CONFD_PID=$!
 
 echo deis-store-gateway running...
@@ -142,4 +142,3 @@ if [[ ! -z $EXTERNAL_PORT ]]; then
 fi
 
 wait
-