From 0779c9ae219b6a6d1015201f5b8fb99a47f2d23d Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Tue, 15 Dec 2020 14:03:02 +0800 Subject: [PATCH] Adding code to reack branch issue-#1 --- Dockerfile | 2 +- Jenkinsfile | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2549cc0..12c3bec 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 master https://git.ervine.org/jonny/flask-python-helm /data && \ + mkdir /data && cd /data && git clone --single-branch --branch issue-#1 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 && \ diff --git a/Jenkinsfile b/Jenkinsfile index bff5a91..05cf44f 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: '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=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=true --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' } } + 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 -}