diff --git a/Dockerfile b/Dockerfile index fdcbfd7..0cbd064 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM scratch -LABEL maintainer "Jonathan Ervine " architecture="x86_64" alpineversion="3.10.5" build="08052020" +LABEL maintainer "Jonathan Ervine " 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"] diff --git a/Jenkinsfile b/Jenkinsfile index 2d354b6..216de4f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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") } } diff --git a/alpine-minirootfs-3.10.5-x86_64.tar.gz b/alpine-minirootfs-3.10.5-x86_64.tar.gz deleted file mode 100644 index ec39579..0000000 Binary files a/alpine-minirootfs-3.10.5-x86_64.tar.gz and /dev/null differ diff --git a/alpine-minirootfs-3.12.0-x86_64.tar.gz b/alpine-minirootfs-3.12.0-x86_64.tar.gz new file mode 100644 index 0000000..6337b70 Binary files /dev/null and b/alpine-minirootfs-3.12.0-x86_64.tar.gz differ