From 174e5557c8da0dc00ae22ef2d7ed8c1d52ff5651 Mon Sep 17 00:00:00 2001
From: Cedric Meury <cedric@meury.com>
Date: Wed, 28 Mar 2018 01:10:50 +0200
Subject: [PATCH 1/2] alpine 3.7; helm 2.8.2; check sha256 sum; add run target

---
 Dockerfile | 12 +++++++++---
 Makefile   |  3 +++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2868c0bc..639bb73f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,14 @@
-FROM alpine:3.4
+FROM alpine:3.7
 
+ENV HELM_VERSION=v2.8.2
+ENV HELM_LOCATION="https://kubernetes-helm.storage.googleapis.com"
+ENV HELM_FILENAME="helm-${HELM_VERSION}-linux-amd64.tar.gz"
+ENV HELM_SHA256="614b5ac79de4336b37c9b26d528c6f2b94ee6ccacb94b0f4b8d9583a8dd122d3"
 RUN apk add --update curl && \
-	curl -L https://kubernetes-helm.storage.googleapis.com/helm-v2.0.0-linux-amd64.tar.gz | \
-	tar zxf - && mv /linux-amd64/helm /usr/local/bin/ && rm -r /linux-amd64 && apk del curl
+    curl -L ${HELM_LOCATION}/${HELM_FILENAME} -o ${HELM_FILENAME} && \
+    sha256sum ${HELM_FILENAME} | grep -q "${HELM_SHA256}" && \
+    tar zxf ${HELM_FILENAME} && mv /linux-amd64/helm /usr/local/bin/ && \
+    rm ${HELM_FILENAME} && rm -r /linux-amd64 && apk del curl
 
 COPY dist/helmfile_linux_amd64 /usr/local/bin/helmfile
 
diff --git a/Makefile b/Makefile
index 1437a46a..63c2a314 100644
--- a/Makefile
+++ b/Makefile
@@ -36,6 +36,9 @@ release: pristine cross
 image: cross
 	docker build -t quay.io/roboll/helmfile:${TAG} .
 
+run: image
+	docker run --rm -it -t quay.io/roboll/helmfile:${TAG} sh
+
 push: image
 	docker push quay.io/roboll/helmfile:${TAG}
 

From 963c84e07c7c9f37903fa296fb17012a9ea385dc Mon Sep 17 00:00:00 2001
From: Cedric Meury <cedric@meury.com>
Date: Fri, 30 Mar 2018 11:41:47 +0200
Subject: [PATCH 2/2] use wget to download file

---
 Dockerfile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 639bb73f..e18d9ae9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,11 +4,10 @@ ENV HELM_VERSION=v2.8.2
 ENV HELM_LOCATION="https://kubernetes-helm.storage.googleapis.com"
 ENV HELM_FILENAME="helm-${HELM_VERSION}-linux-amd64.tar.gz"
 ENV HELM_SHA256="614b5ac79de4336b37c9b26d528c6f2b94ee6ccacb94b0f4b8d9583a8dd122d3"
-RUN apk add --update curl && \
-    curl -L ${HELM_LOCATION}/${HELM_FILENAME} -o ${HELM_FILENAME} && \
+RUN wget ${HELM_LOCATION}/${HELM_FILENAME} && \
     sha256sum ${HELM_FILENAME} | grep -q "${HELM_SHA256}" && \
     tar zxf ${HELM_FILENAME} && mv /linux-amd64/helm /usr/local/bin/ && \
-    rm ${HELM_FILENAME} && rm -r /linux-amd64 && apk del curl
+    rm ${HELM_FILENAME} && rm -r /linux-amd64
 
 COPY dist/helmfile_linux_amd64 /usr/local/bin/helmfile