Reset to master settings

This commit is contained in:
Jonathan Ervine 2020-12-18 10:10:31 +08:00
parent eba056a70f
commit 6888017548
2 changed files with 3 additions and 3 deletions

View File

@ -11,7 +11,7 @@ RUN apk update && \
apk -U upgrade --ignore alpine-baselayout && \ apk -U upgrade --ignore alpine-baselayout && \
apk -U add python3 gcc py3-pip python3-dev musl-dev libffi-dev git curl && \ apk -U add python3 gcc py3-pip python3-dev musl-dev libffi-dev git curl && \
adduser -D python && \ adduser -D python && \
mkdir /data && cd /data && git clone --single-branch --branch issue-#1 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 && \ pip3 install -r /data/requirements.txt && \
curl -L https://get.helm.sh/helm-v3.4.2-linux-amd64.tar.gz -o /tmp/helm.tgz && \ 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 && \ tar -zxvf /tmp/helm.tgz --strip-components=1 -C /usr/local/bin linux-amd64/helm && \

4
Jenkinsfile vendored
View File

@ -25,9 +25,9 @@ spec:
node(POD_LABEL) { node(POD_LABEL) {
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: 'master', 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-3:v3.12.1-1 --destination=harbor.ervine.dev/public/x86_64/alpine/helm-3: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 --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') { stage('Notify gchat') {