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

Commit dd2ee1b

Browse files
committed
Merge pull request #1 from sportebois/fix/consul-template-install
Fix Consul-template installation
2 parents 837695a + 28c9041 commit dd2ee1b

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
FROM 1science/alpine:3.1
66

77
# Node and NPM version
8-
ENV NODE_VERSION=4.2.2 NPM_VERSION=3.4.1
8+
ENV NODE_VERSION=5.11.0 NPM_VERSION=3.8.3
99

1010
# Install Node and NPM
1111
RUN apk update && apk-install make gcc g++ python linux-headers paxctl libgcc libstdc++ && \
@@ -23,4 +23,4 @@ RUN apk update && apk-install make gcc g++ python linux-headers paxctl libgcc li
2323
/usr/lib/node_modules/npm/man /usr/lib/node_modules/npm/doc /usr/lib/node_modules/npm/html && \
2424
echo -ne "- with Node.js `node --version`\n" >> /root/.built
2525

26-
CMD [ "bash" ]
26+
CMD [ "bash" ]

consul/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
#
22
# Node JS image with Consul Template and Fileconsul
33
#
4-
FROM 1science/node:4.2.2
4+
FROM 1science/node:5.11.0
55

66
# Consul template and fileconsul for configuration management
77
ENV S6_OVERLAY_VERSION=1.9.1.3 CONSUL_TEMPLATE_VERSION=0.11.0 FILECONSUL_VERSION=0.1.1
88

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 / && \
11-
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 && \
11+
curl -Ls https://releases.hashicorp.com/consul-template/${CONSUL_TEMPLATE_VERSION}/consul-template_${CONSUL_TEMPLATE_VERSION}_linux_amd64.zip -o consul-template.zip && unzip consul-template.zip -d /usr/local/bin && \
1212
rm -f consul-template* && \
1313
echo -ne "- with `consul-template -v 2>&1`\n" >> /root/.built
1414

1515
# Add services configuration
1616
ADD etc /etc
1717

1818
ENTRYPOINT ["/init"]
19-
CMD [ "bash" ]
19+
CMD [ "bash" ]

0 commit comments

Comments
 (0)