diff --git a/Dockerfile b/Dockerfile index 264bbab..062a10e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM alpine as build ARG VERSION -ENV ALPINE_SERIES 3.12 +ENV ALPINE_SERIES 3.13 ENV ALPINE_MIRROR https://ftp.halifax.rwth-aachen.de/alpine/v${ALPINE_SERIES} ENV ALPINE_ARCH x86_64 diff --git a/Jenkinsfile b/Jenkinsfile index 3468c91..4991759 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ -version = "3.12.3" +version = "3.13.0" project = "alpine" repo = "zknt" registry = "reg.zknt.org" @@ -14,17 +14,14 @@ pipeline { script { def customImage = docker.build(registry+'/'+repo+'/'+project, "--pull --build-arg VERSION=$version --build-arg DATE=$timeStamp .") customImage.push(version) - customImage.push("latest") - customImage.push("3.12") + customImage.push("3.13") def io_registry_credentials = "3deeee3d-6fce-4430-98dd-9b4db56f43f7" withDockerRegistry([ credentialsId: io_registry_credentials ]) { def io_registry_image = repo + '/' + project + ':' + version sh "docker image tag " + registry+'/'+repo+'/'+project+':'+version + ' ' + io_registry_image sh "docker push " + io_registry_image - sh "docker image tag " + registry+'/'+repo+'/'+project+':'+version + ' ' + io_registry_image.split(/\:/)[0] + ":latest" - sh "docker push " + io_registry_image.split(/\:/)[0] + ":latest" - sh "docker image tag " + registry+'/'+repo+'/'+project+':'+version + ' ' + io_registry_image.split(/\:/)[0] + ":3.12" - sh "docker push " + io_registry_image.split(/\:/)[0] + ":3.12" + sh "docker image tag " + registry+'/'+repo+'/'+project+':'+version + ' ' + io_registry_image.split(/\:/)[0] + ":3.13" + sh "docker push " + io_registry_image.split(/\:/)[0] + ":3.13" } def quay_credentials= "18fb6f7e-c6bc-4d06-9bf9-08c2af6bfc1a" @@ -32,10 +29,8 @@ pipeline { def quay_image = 'quay.io/' + repo + '/' + project + ':' + version sh "docker image tag " + registry+'/'+repo+'/'+project+':'+version + ' ' + quay_image sh "docker push " + quay_image - sh "docker image tag " + registry+'/'+repo+'/'+project+':'+version + ' ' + quay_image.split(/\:/)[0] + ":latest" - sh "docker push " + quay_image.split(/\:/)[0] + ":latest" - sh "docker image tag " + registry+'/'+repo+'/'+project+':'+version + ' ' + quay_image.split(/\:/)[0] + ":3.12" - sh "docker push " + quay_image.split(/\:/)[0] + ":3.12" + sh "docker image tag " + registry+'/'+repo+'/'+project+':'+version + ' ' + quay_image.split(/\:/)[0] + ":3.13" + sh "docker push " + quay_image.split(/\:/)[0] + ":3.13" } } } diff --git a/README.md b/README.md index d95a05d..32996e3 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ stock alpine Basic Alpine base image, pulling Alpines minirootfs and extracting to `scratch`. -Builds both `edge` and latest release (currently `3.12`) in branches. +Builds both `edge` and latest release (currently `3.13`) in branches. Source repository: https://git.zknt.org/dockers/alpine diff --git a/build.yaml b/build.yaml index 613f41f..8fd95a3 100644 --- a/build.yaml +++ b/build.yaml @@ -1,5 +1,4 @@ -version: 3.12.3 +version: 3.13.0 project: alpine additional_tags: - - latest - - 3.12 + - 3.13