Skip to content

Commit 007a836

Browse files
committed
Use Consul 1.0.6 and CP 3.7. Removed backup job but leave code in manage.py.
1 parent 950c551 commit 007a836

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@ RUN curl -Ls -o get-pip.py https://bootstrap.pypa.io/get-pip.py && \
2121
mock==2.0.0
2222

2323
# Add consul agent
24-
RUN export CONSUL_VERSION=0.9.0 \
25-
&& export CONSUL_CHECKSUM=33e54c7d9a93a8ce90fc87f74c7f787068b7a62092b7c55a945eea9939e8577f \
24+
RUN export CONSUL_VERSION=1.0.6 \
25+
&& export CONSUL_CHECKSUM=bcc504f658cef2944d1cd703eda90045e084a15752d23c038400cf98c716ea01 \
2626
&& curl --retry 7 --fail -vo /tmp/consul.zip "https://releases.hashicorp.com/consul/${CONSUL_VERSION}/consul_${CONSUL_VERSION}_linux_amd64.zip" \
2727
&& echo "${CONSUL_CHECKSUM} /tmp/consul.zip" | sha256sum -c \
2828
&& unzip /tmp/consul -d /usr/local/bin \
2929
&& rm /tmp/consul.zip \
3030
&& mkdir -p /opt/consul/config
3131

3232
# Add ContainerPilot and set its configuration file path
33-
ENV CONTAINERPILOT_VER 3.3.0
33+
ENV CONTAINERPILOT_VER 3.7.0
3434
ENV CONTAINERPILOT /etc/containerpilot.json5
35-
RUN export CONTAINERPILOT_CHECKSUM=62621712ef6ba755e24805f616096de13e2fd087 \
35+
RUN export CONTAINERPILOT_CHECKSUM=b10b30851de1ae1c095d5f253d12ce8fe8e7be17 \
3636
&& curl -Lso /tmp/containerpilot.tar.gz \
3737
"https://github.com/joyent/containerpilot/releases/download/${CONTAINERPILOT_VER}/containerpilot-${CONTAINERPILOT_VER}.tar.gz" \
3838
&& echo "${CONTAINERPILOT_CHECKSUM} /tmp/containerpilot.tar.gz" | sha1sum -c \

etc/containerpilot.json5

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,6 @@
2626
restarts: "unlimited"
2727
},
2828
{{ end }}
29-
{{ if .DUMP_INTERVAL }}
30-
{
31-
name: "backup",
32-
exec: "python /usr/local/bin/manage.py backup",
33-
when: {
34-
interval: "{{ .DUMP_INTERVAL }}",
35-
}
36-
},
37-
{{ end }}
3829
{
3930
name: "mongodb-replicaset",
4031
port: 27017,

0 commit comments

Comments
 (0)