From 6f2d50163d0a8271038024d75707d467d0db511e Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Thu, 9 Jul 2020 21:47:29 +0800 Subject: [PATCH] Using Alpine Linux 3.12 --- Dockerfile | 2 +- Jenkinsfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0e72354..6834f89 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Base on latest (edge) alpine image -FROM harbor.ervine.dev/library/x86_64/alpine/alpine-3.11 +FROM harbor.ervine.dev/library/x86_64/alpine/alpine:3.12 LABEL maintainer “Jonathan Ervine” architecture="x86_64" date="17022020" diff --git a/Jenkinsfile b/Jenkinsfile index 1775b23..e78f143 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,7 @@ node("docker-node") { docker.withRegistry('https://harbor.ervine.dev', 'jenkins-to-harbor') { - git branch: "3.11.6", url: "ssh://git@git.ervine.org/jonny/x86_64-alpine-cp", credentialsId: 'jenkins-to-git' + git branch: "master", url: "ssh://git@git.ervine.org/jonny/x86_64-alpine-cp", credentialsId: 'jenkins-to-git' sh "git rev-parse HEAD > .git/commit-id" def commit_id = readFile('.git/commit-id').trim()