From 3d6ed7237abaf60f87cb30d5af35b43f11aadaff Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Wed, 16 Dec 2020 12:55:38 +0800 Subject: [PATCH] Use helm3 --- Dockerfile | 4 ++-- Jenkinsfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 12c3bec..923be47 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,8 +15,8 @@ RUN apk update && \ pip3 install -r /data/requirements.txt && \ curl -L "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl" -o /usr/local/bin/kubectl && \ chmod 755 /usr/local/bin/kubectl && \ - curl -L https://get.helm.sh/helm-v2.13.1-linux-amd64.tar.gz -o /tmp/helm-2.13.1.tgz && \ - tar -zxvf /tmp/helm-2.13.1.tgz --strip-components=1 -C /usr/local/bin linux-amd64/helm && \ + curl -L https://get.helm.sh/helm-v3.4.2-linux-amd64.tar.gz -o /tmp/helm.tgz && \ + tar -zxvf /tmp/helm.tgz --strip-components=1 -C /usr/local/bin linux-amd64/helm && \ rm -rf /tmp/src && rm -rf /var/cache/apk/* EXPOSE 3000 diff --git a/Jenkinsfile b/Jenkinsfile index dc67cee..436b31a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -27,7 +27,7 @@ spec: stage('Build with Kaniko') { git branch: 'issue-#1', url: 'ssh://git@git.ervine.org/jonny/x86_64-alpine-helm-python.git', credentialsId: 'jenkins-to-git' container('kaniko') { - sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/alpine/helm:v3.12.1-1 --destination=harbor.ervine.dev/public/x86_64/alpine/helm:v3.12-1 --destination=harbor.ervine.dev/public/x86_64/alpine/helm-2.13.1:v3.12.1-1 --destination=harbor.ervine.dev/public/x86_64/alpine/helm-2.13.1:v3.12-1' + sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/alpine/helm:v3.12.1-1 --destination=harbor.ervine.dev/public/x86_64/alpine/helm:v3.12-1 --destination=harbor.ervine.dev/public/x86_64/alpine/helm-3:v3.12.1-1 --destination=harbor.ervine.dev/public/x86_64/alpine/helm-3:v3.12-1' } } stage('Notify gchat') {