From e5d63902eb8af777d5f0278782cac486a50bedd5 Mon Sep 17 00:00:00 2001 From: Mark Determan Date: Wed, 9 Jan 2019 12:13:07 -0600 Subject: [PATCH 01/11] update kubectl --- Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 506777a..97a7e95 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ RUN apk add --update ca-certificates \ && wget https://storage.googleapis.com/kubernetes-helm/helm-${HELM_VERSION}-linux-amd64.tar.gz \ && tar -xvf helm-${HELM_VERSION}-linux-amd64.tar.gz -FROM mdeterman/k8-kubectl:v1.11.3 +FROM mdeterman/k8-kubectl:v1.13.1 LABEL maintainer="Mark Determan" @@ -26,4 +26,6 @@ LABEL org.label-schema.vcs-ref=$REF_SLUG \ org.label-schema.build-date=$BUILD_DATE \ org.label-schema.docker.dockerfile="/Dockerfile" -COPY --from=builder /root/linux-amd64/helm /usr/local/bin \ No newline at end of file +COPY --from=builder /root/linux-amd64/helm /usr/local/bin + +RUN mkdir -p /etc/deploy/config \ No newline at end of file -- GitLab From 86a505df44d088044fdf451511235dc5b4915ba6 Mon Sep 17 00:00:00 2001 From: Mark Determan Date: Wed, 9 Jan 2019 13:05:29 -0600 Subject: [PATCH 02/11] fix issues --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 97a7e95..945c24b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,4 +28,4 @@ LABEL org.label-schema.vcs-ref=$REF_SLUG \ COPY --from=builder /root/linux-amd64/helm /usr/local/bin -RUN mkdir -p /etc/deploy/config \ No newline at end of file +RUN mkdir -p /etc/deploy \ No newline at end of file -- GitLab From 455a293ff29f7fbc9792cce8f98ec56a31354895 Mon Sep 17 00:00:00 2001 From: Mark Determan Date: Thu, 10 Jan 2019 06:30:40 -0600 Subject: [PATCH 03/11] add git for helm --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 945c24b..332874c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ FROM mdeterman/k8-kubectl:v1.13.1 LABEL maintainer="Mark Determan" -RUN apk add --update ca-certificates +RUN apk add --update ca-certificates git ARG REF_SLUG ARG BUILD_DATE -- GitLab From d47b39598327af0b0a12431cc328e0928c05d40b Mon Sep 17 00:00:00 2001 From: Mark Determan Date: Thu, 10 Jan 2019 07:21:25 -0600 Subject: [PATCH 04/11] add curl --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 332874c..0ec7d99 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ FROM mdeterman/k8-kubectl:v1.13.1 LABEL maintainer="Mark Determan" -RUN apk add --update ca-certificates git +RUN apk add --update ca-certificates git curl ARG REF_SLUG ARG BUILD_DATE -- GitLab From 71621eb93394281acb35caa5fc0cc9a323f8daa2 Mon Sep 17 00:00:00 2001 From: Mark Determan Date: Thu, 10 Jan 2019 07:37:31 -0600 Subject: [PATCH 05/11] add bash --- Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0ec7d99..c3b4286 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ FROM mdeterman/k8-kubectl:v1.13.1 LABEL maintainer="Mark Determan" -RUN apk add --update ca-certificates git curl +RUN apk add --update ca-certificates git curl bash ARG REF_SLUG ARG BUILD_DATE @@ -28,4 +28,6 @@ LABEL org.label-schema.vcs-ref=$REF_SLUG \ COPY --from=builder /root/linux-amd64/helm /usr/local/bin -RUN mkdir -p /etc/deploy \ No newline at end of file +RUN mkdir -p /etc/deploy + +CMD ["/bin/bash"] \ No newline at end of file -- GitLab From 7b35f860afd278db84d90fae7fe97dab0764494b Mon Sep 17 00:00:00 2001 From: Mark Determan Date: Thu, 10 Jan 2019 08:00:57 -0600 Subject: [PATCH 06/11] change to debian --- Dockerfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index c3b4286..ed21061 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.8 as builder +FROM debian:buster as builder ARG REF_NAME @@ -6,8 +6,8 @@ ENV HELM_VERSION=$REF_NAME WORKDIR /root/ -RUN apk add --update ca-certificates \ - && apk add --update -t deps wget \ +RUN apt-get update \ + && apt-get install -y wget \ && wget https://storage.googleapis.com/kubernetes-helm/helm-${HELM_VERSION}-linux-amd64.tar.gz \ && tar -xvf helm-${HELM_VERSION}-linux-amd64.tar.gz @@ -15,7 +15,9 @@ FROM mdeterman/k8-kubectl:v1.13.1 LABEL maintainer="Mark Determan" -RUN apk add --update ca-certificates git curl bash +RUN apt-get update \ + && apt-get install -y git curl \ + && rm -rf /var/lib/apt/lists/* ARG REF_SLUG ARG BUILD_DATE @@ -28,6 +30,4 @@ LABEL org.label-schema.vcs-ref=$REF_SLUG \ COPY --from=builder /root/linux-amd64/helm /usr/local/bin -RUN mkdir -p /etc/deploy - -CMD ["/bin/bash"] \ No newline at end of file +RUN mkdir -p /etc/deploy \ No newline at end of file -- GitLab From 98eece5fe883413ebfe05acbaaff9ab475d48a98 Mon Sep 17 00:00:00 2001 From: Mark Determan Date: Thu, 10 Jan 2019 09:15:44 -0600 Subject: [PATCH 07/11] add gsutil --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ed21061..93d67ec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ FROM mdeterman/k8-kubectl:v1.13.1 LABEL maintainer="Mark Determan" RUN apt-get update \ - && apt-get install -y git curl \ + && apt-get install -y git curl gsutil \ && rm -rf /var/lib/apt/lists/* ARG REF_SLUG -- GitLab From d79d549ce9ecefc1a102c6dd6894413c78c8006d Mon Sep 17 00:00:00 2001 From: Mark Determan Date: Thu, 17 Jan 2019 15:14:58 -0600 Subject: [PATCH 08/11] work on helm --- Dockerfile | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 93d67ec..aada504 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,17 @@ -FROM debian:buster as builder +FROM debian:buster as helm-builder ARG REF_NAME +ARG SOPS_VER=3.2.0 ENV HELM_VERSION=$REF_NAME +ENV SOPS_VERSION=$SOPS_VER WORKDIR /root/ RUN apt-get update \ - && apt-get install -y wget \ - && wget https://storage.googleapis.com/kubernetes-helm/helm-${HELM_VERSION}-linux-amd64.tar.gz \ - && tar -xvf helm-${HELM_VERSION}-linux-amd64.tar.gz + && apt-get install -y curl \ + && curl -Ls https://storage.googleapis.com/kubernetes-helm/helm-${HELM_VERSION}-linux-amd64.tar.gz | tar xz \ + && curl -Ls https://github.com/mozilla/sops/releases/download/${SOPS_VERSION}/sops_${SOPS_VERSION}_amd64.deb -o /sops_amd64.deb FROM mdeterman/k8-kubectl:v1.13.1 @@ -28,6 +30,15 @@ LABEL org.label-schema.vcs-ref=$REF_SLUG \ org.label-schema.build-date=$BUILD_DATE \ org.label-schema.docker.dockerfile="/Dockerfile" -COPY --from=builder /root/linux-amd64/helm /usr/local/bin +COPY --from=helm-builder /root/linux-amd64/helm /usr/local/bin +RUN helm version --client -RUN mkdir -p /etc/deploy \ No newline at end of file +COPY --from=helm-builder /sops_amd64.deb /sops_amd64.deb + +RUN dpkg -i /sops_amd64.deb && \ + rm /sops_amd64.deb + +RUN mkdir -p /etc/deploy && \ + helm init --client-only && \ + helm plugin install https://github.com/futuresimple/helm-secrets && \ + helm repo add io-determan https://io-determan-charts.storage.googleapis.com \ No newline at end of file -- GitLab From 9b2b5d1210108de9922952883ac85c51ee6e04c5 Mon Sep 17 00:00:00 2001 From: Mark Determan Date: Thu, 17 Jan 2019 16:57:32 -0600 Subject: [PATCH 09/11] set version for helm-secrests --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index aada504..06a1cef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,5 +40,5 @@ RUN dpkg -i /sops_amd64.deb && \ RUN mkdir -p /etc/deploy && \ helm init --client-only && \ - helm plugin install https://github.com/futuresimple/helm-secrets && \ + helm plugin install https://github.com/futuresimple/helm-secrets --version 1.3.1 && \ helm repo add io-determan https://io-determan-charts.storage.googleapis.com \ No newline at end of file -- GitLab From 304f484f95426ba3fffe8364718c9f6253b39de7 Mon Sep 17 00:00:00 2001 From: Mark Determan Date: Fri, 18 Jan 2019 07:15:10 -0600 Subject: [PATCH 10/11] clean up docker file --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 06a1cef..1961b99 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,5 +40,4 @@ RUN dpkg -i /sops_amd64.deb && \ RUN mkdir -p /etc/deploy && \ helm init --client-only && \ - helm plugin install https://github.com/futuresimple/helm-secrets --version 1.3.1 && \ helm repo add io-determan https://io-determan-charts.storage.googleapis.com \ No newline at end of file -- GitLab From f506ac6c8d97948cc2fd9fec21bc8c1952cc2e28 Mon Sep 17 00:00:00 2001 From: Mark Determan Date: Wed, 23 Jan 2019 16:05:57 +0000 Subject: [PATCH 11/11] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 96f9fa1..50af6a1 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,8 @@ This container provides the Helm client for use with Kubernetes ## Supported tags and respective `Dockerfile` links -- v2.12.0, latest [(v2.12.0/Dockerfile)](https://gitlab.com/io_determan/docker/k8-helm/blob/v2.12.0/Dockerfile) +- v2.12.1, latest [(v2.12.0/Dockerfile)](https://gitlab.com/io_determan/docker/k8-helm/blob/v2.12.1/Dockerfile) +- v2.12.0 [(v2.12.0/Dockerfile)](https://gitlab.com/io_determan/docker/k8-helm/blob/v2.12.0/Dockerfile) - v2.11.0, [(v2.11.0/Dockerfile)](https://gitlab.com/io_determan/docker/k8-helm/blob/v2.11.0/Dockerfile) - v2.10.0, [(v2.10.0/Dockerfile)](https://gitlab.com/io_determan/docker/k8-helm/blob/v2.10.0/Dockerfile) - v2.9.1, [(v2.9.1/Dockerfile)](https://gitlab.com/io_determan/docker/k8-helm/blob/v2.9.1/Dockerfile) \ No newline at end of file -- GitLab