From 6573dfd7a1b2e815b5569d00cb100f4e589e98ed Mon Sep 17 00:00:00 2001 From: sbathgate <30994898+sbathgate@users.noreply.github.com> Date: Mon, 20 Jul 2020 15:55:40 -0700 Subject: [PATCH] Update setup Dockerfile - adjust helm tarball path (#484) * Update setup Dockerfile - adjust helm tarball path * Correct missing chained run tag --- docker/setup/Dockerfile | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/docker/setup/Dockerfile b/docker/setup/Dockerfile index cb7571f4..dc5fc9d0 100644 --- a/docker/setup/Dockerfile +++ b/docker/setup/Dockerfile @@ -9,14 +9,13 @@ ENV NGINX_INGRESS_VERSION="0.3.7" RUN apk add -q --no-cache \ jq=1.5-r2 \ sshpass=1.05-r0 \ - curl=7.59.0-r0 && \ - curl -sLfO "https://storage.googleapis.com/kubernetes-helm/helm-v${HELM_VERSION}-linux-amd64.tar.gz" && \ - tar xf "helm-v${HELM_VERSION}-linux-amd64.tar.gz" && \ - mv "linux-amd64/helm" /usr/local/bin/helm && \ - chmod +x /usr/local/bin/helm && \ - rm -rf "linux-amd64" "helm-v${HELM_VERSION}-linux-amd64.tar.gz" && \ - az aks install-cli --client-version "${KUBECTL_VERSION}" && \ - mkdir /secrets + && wget -q "https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz" \ + && tar xf "helm-v${HELM_VERSION}-linux-amd64.tar.gz" \ + && mv "linux-amd64/helm" /usr/local/bin/helm \ + && chmod +x /usr/local/bin/helm \ + && rm -rf "linux-amd64" "helm-v${HELM_VERSION}-linux-amd64.tar.gz" \ + && az aks install-cli --client-version "${KUBECTL_VERSION}" \ + && mkdir /secrets COPY docker/setup/requirements.txt ./ RUN pip install --no-cache-dir -r requirements.txt