diff --git a/Dockerfile b/Dockerfile index 2549cc0..b36116c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,10 +13,8 @@ RUN apk update && \ adduser -D python && \ mkdir /data && cd /data && git clone --single-branch --branch master https://git.ervine.org/jonny/flask-python-helm /data && \ 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 bff5a91..0d3d034 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -25,14 +25,14 @@ spec: node(POD_LABEL) { stage('Build with Kaniko') { - git url: 'ssh://git@git.ervine.org/jonny/x86_64-alpine-helm-python.git', credentialsId: 'jenkins-to-git' + git branch: 'master', 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=true --destination=harbor.ervine.dev/public/x86_64/alpine/helm:v3.12.0 --destination=harbor.ervine.dev/public/x86_64/alpine/helm:v3.12 --destination=harbor.ervine.dev/public/x86_64/alpine/helm-2.13.1:v3.12.0 --destination=harbor.ervine.dev/public/x86_64/alpine/helm-2.13.1:v3.12' + sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/alpine/helm:v3.12.1 --destination=harbor.ervine.dev/public/x86_64/alpine/helm:v3.12 --destination=harbor.ervine.dev/public/x86_64/alpine/helm-3:v3.12.1 --destination=harbor.ervine.dev/public/x86_64/alpine/helm-3:v3.12' } } + stage('Notify gchat') { + hangoutsNotify message: "Helm python flask Application on Alpine Linux 3.12.1 has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false + } } } -stage('Notify gchat') { - hangoutsNotify message: "Helm python flask Application on Alpine Linux 3.12.0 has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false -}