diff --git a/Dockerfile b/Dockerfile index 39696f0..b36116c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ RUN apk update && \ apk -U upgrade --ignore alpine-baselayout && \ apk -U add python3 gcc py3-pip python3-dev musl-dev libffi-dev git curl && \ adduser -D python && \ - mkdir /data && cd /data && git clone --single-branch --branch issue-#2 https://git.ervine.org/jonny/flask-python-helm /data && \ + 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://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 && \ diff --git a/Jenkinsfile b/Jenkinsfile index e305de1..1136bf7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -25,13 +25,13 @@ spec: node(POD_LABEL) { stage('Build with Kaniko') { - git branch: 'issue-#2', 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=false --destination=harbor.ervine.dev/public/x86_64/alpine/helm-3:v3.12.1-2 --destination=harbor.ervine.dev/public/x86_64/alpine/helm-3:v3.12-2' + sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --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-2 has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false + hangoutsNotify message: "Helm python flask Application on Alpine Linux 3.12.1 has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false } } }