Skip to content

Commit b0798dd

Browse files
author
Matthew Fisher
committed
ref(builder): move confdir to /etc/confd
Confd reads this directory by default
1 parent 3ab0eab commit b0798dd

13 files changed

Lines changed: 2 additions & 2 deletions

File tree

builder/rootfs/bin/boot

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ function etcd_safe_mkdir {
4141
etcd_safe_mkdir $ETCD_PATH/users
4242

4343
# wait for confd to run once and install initial templates
44-
until confd -onetime -node $ETCD --confdir /app --log-level error; do
44+
until confd -onetime -node $ETCD --log-level error; do
4545
echo "builder: waiting for confd to write initial templates..."
4646
sleep $(($ETCD_TTL/2)) # sleep for half the TTL
4747
done
4848

4949
# spawn confd in the background to update services based on etcd changes
50-
confd -node $ETCD --confdir /app --log-level error --interval 5 &
50+
confd -node $ETCD --log-level error --interval 5 &
5151
CONFD_PID=$!
5252

5353
# remove any pre-existing docker.sock
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)