diff --git a/Dockerfile b/Dockerfile index 506777a9eb23e618ba6f66047dcb19a2993b5bd5..1961b9954c883c5c01997ccad2b253daa869db38 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,21 +1,25 @@ -FROM alpine:3.8 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 apk add --update ca-certificates \ - && apk add --update -t deps wget \ - && wget https://storage.googleapis.com/kubernetes-helm/helm-${HELM_VERSION}-linux-amd64.tar.gz \ - && tar -xvf helm-${HELM_VERSION}-linux-amd64.tar.gz +RUN apt-get update \ + && 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.11.3 +FROM mdeterman/k8-kubectl:v1.13.1 LABEL maintainer="Mark Determan" -RUN apk add --update ca-certificates +RUN apt-get update \ + && apt-get install -y git curl gsutil \ + && rm -rf /var/lib/apt/lists/* ARG REF_SLUG ARG BUILD_DATE @@ -26,4 +30,14 @@ 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=helm-builder /root/linux-amd64/helm /usr/local/bin +RUN helm version --client + +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 repo add io-determan https://io-determan-charts.storage.googleapis.com \ No newline at end of file diff --git a/README.md b/README.md index 96f9fa1f075582b1b8d3836f0f5832c03630d953..50af6a17f7a4d78686977b09ae0c1879c5946762 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