From 43eb4e5281d2226fc9d065e775e5bcb6894e19c8 Mon Sep 17 00:00:00 2001
From: jace-ys <jaceys.tan@gmail.com>
Date: Tue, 10 Dec 2019 17:24:58 +0000
Subject: [PATCH] Pull in envconsul fork in Docker image

---
 Dockerfile | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2d79a188..7fcfa5dd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,6 +3,10 @@ FROM golang:1.13.4 as builder
 WORKDIR /go/src/github.com/gocardless/theatre
 COPY . /go/src/github.com/gocardless/theatre
 RUN make VERSION=$(cat VERSION) build
+# Clone our fork of envconsul and build it
+RUN git clone https://github.com/gocardless/envconsul.git -b gocardless \
+      && make -C envconsul linux/amd64 \
+      && mv envconsul/pkg/linux_amd64/envconsul bin
 
 # Use ubuntu as our base package to enable generic system tools
 FROM ubuntu:bionic-20191029
@@ -13,22 +17,9 @@ RUN set -x \
       && apt-get update -y \
       && apt-get install -y --no-install-recommends \
                             ca-certificates \
-                            curl \
-                            unzip \
       && apt-get clean -y \
       && rm -rf /var/lib/apt/lists/*
 
-# Install envconsul for theatre-envconsul
-ENV ENVCONSUL_VERSION=0.9.1 \
-    ENVCONSUL_SHA256=b58d032ad61937eca9def17482807124fa1bafac7e7bb5e025ea8a28d9c6ce42
-
-RUN set -x \
-    && curl -o /tmp/envconsul.zip -fsL https://releases.hashicorp.com/envconsul/0.9.1/envconsul_${ENVCONSUL_VERSION}_linux_amd64.zip \
-    && echo ${ENVCONSUL_SHA256} /tmp/envconsul.zip | sha256sum -c \
-    && unzip /tmp/envconsul.zip -d /tmp \
-    && mv /tmp/envconsul /usr/local/bin/ \
-    && rm /tmp/envconsul.zip
-
 WORKDIR /
 COPY --from=builder /go/src/github.com/gocardless/theatre/bin/* /usr/local/bin/
 ENTRYPOINT ["/bin/bash"]