This repository was archived by the owner on Jun 12, 2018. It is now read-only.
File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff 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
1010RUN 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
1816ADD etc /etc
Load Diff This file was deleted.
Load Diff This file was deleted.
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 11#!/usr/bin/with-contenv sh
22set -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"
610fi
Load Diff This file was deleted.
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments