Use helm3

This commit is contained in:
Jonathan Ervine 2020-12-16 12:55:38 +08:00
parent 4a0db28988
commit 3d6ed7237a
2 changed files with 3 additions and 3 deletions

View File

@ -15,8 +15,8 @@ RUN apk update && \
pip3 install -r /data/requirements.txt && \ 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 && \ 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 && \ 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 && \ curl -L https://get.helm.sh/helm-v3.4.2-linux-amd64.tar.gz -o /tmp/helm.tgz && \
tar -zxvf /tmp/helm-2.13.1.tgz --strip-components=1 -C /usr/local/bin linux-amd64/helm && \ tar -zxvf /tmp/helm.tgz --strip-components=1 -C /usr/local/bin linux-amd64/helm && \
rm -rf /tmp/src && rm -rf /var/cache/apk/* rm -rf /tmp/src && rm -rf /var/cache/apk/*
EXPOSE 3000 EXPOSE 3000

2
Jenkinsfile vendored
View File

@ -27,7 +27,7 @@ spec:
stage('Build with Kaniko') { 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' git branch: 'issue-#1', url: 'ssh://git@git.ervine.org/jonny/x86_64-alpine-helm-python.git', credentialsId: 'jenkins-to-git'
container('kaniko') { 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') { stage('Notify gchat') {