3.12 #1

Manually merged
jonny merged 3 commits from 3.12 into master 2020-07-06 15:08:15 +00:00
4 changed files with 4 additions and 5 deletions
Showing only changes of commit d5c1f1db63 - Show all commits

View File

@ -1,5 +1,5 @@
FROM scratch
LABEL maintainer "Jonathan Ervine <docker@ervine.org>" architecture="x86_64" alpineversion="3.10.5" build="08052020"
LABEL maintainer "Jonathan Ervine <docker@ervine.org>" architecture="x86_64" alpineversion="3.12.0" build="06072020"
ADD alpine-minirootfs-3.10.5-x86_64.tar.gz /
ADD alpine-minirootfs-3.12.0-x86_64.tar.gz /
CMD ["/bin/sh"]

5
Jenkinsfile vendored
View File

@ -1,7 +1,7 @@
node("docker-node") {
docker.withRegistry('https://harbor.ervine.dev', 'jenkins-to-harbor') {
git branch: "3.10", url: "ssh://git@git.ervine.org/jonny/x86_64-alpine", credentialsId: 'jenkins-to-gogs'
git branch: "3.12", url: "ssh://git@git.ervine.org/jonny/x86_64-alpine", credentialsId: 'jenkins-to-git'
sh "git rev-parse HEAD > .git/commit-id"
def commit_id = readFile('.git/commit-id').trim()
@ -13,7 +13,6 @@ node("docker-node") {
stage "publish"
app.push("${env.BUILD_NUMBER}")
app.push("latest")
app.push("3.10")
app.push("3.10.5")
app.push("3.12")
}
}

Binary file not shown.