From dcc582071cf3ac1278db7a8f53bbd3fe59e5e8df Mon Sep 17 00:00:00 2001 From: Chauncey Thorn Date: Mon, 3 Feb 2020 12:15:02 -0500 Subject: [PATCH 1/2] NOTICKET: Added helm3 to container image --- Dockerfile | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0ba29a1..1227d39 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,7 @@ ARG DOCKER_ENGINE_VERSION=stable FROM docker:$DOCKER_ENGINE_VERSION ARG HELM_VERSION=v2.12.3 +ARG HELM3_VERSION=v3.0.3 # @see http://label-schema.org/rc1/ LABEL maintainer="Phase2 " \ @@ -15,6 +16,10 @@ LABEL maintainer="Phase2 " \ org.label-schema.schema-version="1.0" RUN apk add --no-cache \ + build-base \ + python2-dev \ + libffi-dev \ + openssl-dev \ bash \ curl \ openssl \ @@ -30,6 +35,13 @@ RUN apk add --no-cache \ curl -o ./install_helm.sh https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get && \ chmod +x ./install_helm.sh && \ ./install_helm.sh -v ${HELM_VERSION} && \ - helm init --client-only + helm init --client-only && \ + cd /tmp && \ + curl -o /tmp/helm-${HELM3_VERSION}-linux-amd64.tar.gz https://get.helm.sh/helm-${HELM3_VERSION}-linux-amd64.tar.gz && \ + tar -xvzf helm-${HELM3_VERSION}-linux-amd64.tar.gz && \ + mv linux-amd64/helm /usr/local/bin/helm3 && \ + rm -f helm-${HELM3_VERSION}-linux-amd64.tar.gz && \ + rm -rf linux-amd64/ && \ + rm -rf /var/cache/apk/* COPY root / From 3f6d120f3ac46b45059cf5836022dc9520c193ed Mon Sep 17 00:00:00 2001 From: Chauncey Thorn Date: Mon, 3 Feb 2020 15:44:01 -0500 Subject: [PATCH 2/2] NOTICKET: Fixed linting issue by removing the cd /tmp --- Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1227d39..feaeb77 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,11 +36,10 @@ RUN apk add --no-cache \ chmod +x ./install_helm.sh && \ ./install_helm.sh -v ${HELM_VERSION} && \ helm init --client-only && \ - cd /tmp && \ curl -o /tmp/helm-${HELM3_VERSION}-linux-amd64.tar.gz https://get.helm.sh/helm-${HELM3_VERSION}-linux-amd64.tar.gz && \ - tar -xvzf helm-${HELM3_VERSION}-linux-amd64.tar.gz && \ + tar -xvzf /tmp/helm-${HELM3_VERSION}-linux-amd64.tar.gz && \ mv linux-amd64/helm /usr/local/bin/helm3 && \ - rm -f helm-${HELM3_VERSION}-linux-amd64.tar.gz && \ + rm -f /tmp/helm-${HELM3_VERSION}-linux-amd64.tar.gz && \ rm -rf linux-amd64/ && \ rm -rf /var/cache/apk/*