Skip to content
This repository was archived by the owner on Jun 12, 2018. It is now read-only.

Commit 46603cf

Browse files
author
Nicolas Huray
committed
Remove Fileconsul and remove the finish script for consul-template service
1 parent ea06033 commit 46603cf

7 files changed

Lines changed: 8 additions & 64 deletions

File tree

consul/Dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@ ENV S6_OVERLAY_VERSION=1.9.1.3 CONSUL_TEMPLATE_VERSION=0.11.0 FILECONSUL_VERSION
99
# Install S6 Overlay, Consul Template and Fileconsul
1010
RUN curl -Ls https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-amd64.tar.gz | tar -xz -C / && \
1111
curl -Ls https://github.com/hashicorp/consul-template/releases/download/v${CONSUL_TEMPLATE_VERSION}/consul_template_${CONSUL_TEMPLATE_VERSION}_linux_amd64.zip -o consul-template.zip && unzip consul-template.zip -d /usr/local/bin && \
12-
curl -Ls http://dl.bintray.com/foostan/fileconsul/${FILECONSUL_VERSION}_linux_amd64.zip -o fileconsul.zip && unzip fileconsul.zip -d /usr/local/bin && \
13-
rm -f fileconsul.zip consul-template* && \
14-
echo -ne "- with `consul-template -v 2>&1`\n" >> /root/.built && \
15-
echo -ne "- with `fileconsul -v 2>&1`\n" >> /root/.built
12+
rm -f consul-template* && \
13+
echo -ne "- with `consul-template -v 2>&1`\n" >> /root/.built
1614

1715
# Add services configuration
1816
ADD etc /etc

consul/etc/crontabs/root

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

consul/etc/periodic/1min/fileconsul

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

consul/etc/services.d/consul-template/finish

Lines changed: 0 additions & 16 deletions
This file was deleted.
Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
#!/usr/bin/with-contenv sh
22
set -e
33

4-
if [ -n "$CONSUL_URL" -a -d /etc/consul-template/conf ]; then
5-
exec consul-template -consul ${CONSUL_URL} -config "/etc/consul-template/conf"
4+
CONSUL_URL=${CONSUL_URL:-localhost:8500}
5+
6+
if [ -d /etc/consul-template/conf ]; then
7+
exec consul-template \
8+
-consul ${CONSUL_URL} \
9+
-config "/etc/consul-template/conf"
610
fi

consul/etc/services.d/crond/finish

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

consul/etc/services.d/crond/run

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

0 commit comments

Comments
 (0)