Skip to content

Commit e566dd9

Browse files
author
Sam Dodrill
committed
ref(cache): remove confd from deis/cache
1 parent 88a23aa commit e566dd9

5 files changed

Lines changed: 1 addition & 24 deletions

File tree

cache/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ WORKDIR /app
1010
CMD ["/app/bin/boot"]
1111
EXPOSE 6379
1212
ADD . /app
13+
ADD redis.conf /etc/redis/redis.conf

cache/bin/boot

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,6 @@ if ! etcdctl --no-sync -C $ETCD ls $ETCD_PATH >/dev/null 2>&1 ; then
2929
etcdctl --no-sync -C $ETCD mkdir $ETCD_PATH >/dev/null 2>&1 || true
3030
fi
3131

32-
# wait for confd to run once and install initial templates
33-
until confd -onetime -node $ETCD -config-file /app/confd.toml; do
34-
echo "cache: waiting for confd to write initial templates..."
35-
sleep $(($ETCD_TTL/2)) # sleep for half the TTL
36-
done
37-
3832
# spawn the service in the background
3933
cd /var/lib/redis
4034
sudo -u redis /usr/bin/redis-server /etc/redis/redis.conf &
@@ -48,10 +42,6 @@ function on_exit() {
4842
}
4943
trap on_exit INT TERM
5044

51-
# spawn confd in the background to update services based on etcd changes
52-
confd -node $ETCD -config-file /app/confd.toml &
53-
CONFD_PID=$!
54-
5545
echo deis-cache running...
5646

5747
# publish the service to etcd using the injected PORT

cache/conf.d/redis.conf.toml

Lines changed: 0 additions & 9 deletions
This file was deleted.

cache/confd.toml

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)