Skip to content

Commit 1433f85

Browse files
author
Matthew Fisher
committed
chore(*): bump confd to v0.9.0
I've also managed to clean up some of the flags like `--interval` which is only used when `--watch` is not present.
1 parent fd291ca commit 1433f85

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ RUN curl -sSL -o /usr/local/bin/etcdctl https://s3-us-west-2.amazonaws.com/opdem
1010
&& chmod +x /usr/local/bin/etcdctl
1111

1212
# install confd
13-
RUN curl -sSL -o /usr/local/bin/confd https://github.com/kelseyhightower/confd/releases/download/v0.8.0/confd-0.8.0-linux-amd64 \
13+
RUN curl -sSL -o /usr/local/bin/confd https://github.com/kelseyhightower/confd/releases/download/v0.9.0/confd-0.9.0-linux-amd64 \
1414
&& chmod +x /usr/local/bin/confd
1515

1616
# define execution environment

bin/boot

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ done
6565
echo "controller: done running etcd data migrations."
6666

6767
# wait for confd to run once and install initial templates
68-
until confd -onetime -node $ETCD --confdir /app --interval 5 --quiet 2>/dev/null; do
68+
until confd -onetime -node $ETCD --confdir /app --log-level error; do
6969
echo "controller: waiting for confd to write initial templates..."
7070
sleep $(($ETCD_TTL/2)) # sleep for half the TTL
7171
done
@@ -91,7 +91,7 @@ function on_exit() {
9191
trap on_exit TERM
9292

9393
# spawn confd in the background to update services based on etcd changes
94-
confd -node $ETCD --confdir /app --interval 5 --quiet --watch &
94+
confd -node $ETCD --confdir /app --log-level error --watch &
9595
CONFD_PID=$!
9696

9797
echo deis-controller running...

0 commit comments

Comments
 (0)