From b02e9af7e57850c69ceb726455fd0e2f8c0ac87e Mon Sep 17 00:00:00 2001
From: WillPlatnick <wplatnick@gmail.com>
Date: Wed, 15 May 2019 12:54:42 -0400
Subject: [PATCH] 6.0.0

* Update binaries

* Update changelog
---
 CHANGELOG.md | 14 ++++++++++++++
 Dockerfile   | 32 ++++++++++++++++----------------
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd51f28..0db9227 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+# Version 6.0.0
+
+Docker Image: quay.io/lifechurch/k8s-deploy-helper:6.0.0
+
+## Updates
+
+* Updated docker dind image to docker:18.06.3-ce-dind
+
+* Updated Helm to 2.13.1
+
+* Updated kubectl to 1.12.6
+
+* Updated kubeval to 0.8.1
+
 # Version 5.0.1
 
 Docker Image: quay.io/lifechurch/k8s-deploy-helper:5.0.1
diff --git a/Dockerfile b/Dockerfile
index ec61faf..0e11b57 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,26 +1,26 @@
-FROM docker:17.11.0-ce-dind
+FROM docker:18.06.3-ce-dind
 
-ENV HELM_VERSION="2.11.0" \
-    KUBECTL_VERSION="1.10.8" \
-    YQ_VERSION="2.1.1" \ 
-    KUBEVAL_VERSION="0.7.3" \ 
-    GLIBC_VERSION="2.28-r0" \
-    PATH=/opt/kubernetes-deploy:$PATH
+ENV HELM_VERSION="2.13.1" \
+  KUBECTL_VERSION="1.12.6" \
+  YQ_VERSION="2.1.1" \ 
+  KUBEVAL_VERSION="0.8.1" \ 
+  GLIBC_VERSION="2.28-r0" \
+  PATH=/opt/kubernetes-deploy:$PATH
 
 # Install pre-req
 RUN apk add -U openssl curl tar gzip bash ca-certificates git wget jq libintl coreutils \
-   && apk add --virtual build_deps gettext \
-   && mv /usr/bin/envsubst /usr/local/bin/envsubst \
-   && apk del build_deps
+  && apk add --virtual build_deps gettext \
+  && mv /usr/bin/envsubst /usr/local/bin/envsubst \
+  && apk del build_deps
 
 # Install deploy scripts
 COPY / /opt/kubernetes-deploy/
 
 # Install glibc for Alpine
 RUN wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub \ 
-    && wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/$GLIBC_VERSION/glibc-$GLIBC_VERSION.apk \ 
-    && apk add glibc-$GLIBC_VERSION.apk \ 
-    && rm glibc-$GLIBC_VERSION.apk
+  && wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/$GLIBC_VERSION/glibc-$GLIBC_VERSION.apk \ 
+  && apk add glibc-$GLIBC_VERSION.apk \ 
+  && rm glibc-$GLIBC_VERSION.apk
 
 # Install yq
 RUN wget -q -O /usr/local/bin/yq https://github.com/mikefarah/yq/releases/download/$YQ_VERSION/yq_linux_amd64 && chmod +x /usr/local/bin/yq
@@ -30,11 +30,11 @@ RUN wget https://github.com/garethr/kubeval/releases/download/$KUBEVAL_VERSION/k
   && tar xvfzmp kubeval-linux-amd64.tar.gz \
   && mv kubeval /usr/local/bin \
   && chmod +x /usr/local/bin/kubeval
- 
+
 # Install kubectl
 RUN curl -L -o /usr/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v$KUBECTL_VERSION/bin/linux/amd64/kubectl \
-    && chmod +x /usr/bin/kubectl \
-    && kubectl version --client
+  && chmod +x /usr/bin/kubectl \
+  && kubectl version --client
 
 # Install Helm
 RUN set -x \