From 3feddb4316bd663f228129cbc8ad09967cfe0d1a Mon Sep 17 00:00:00 2001 From: chris Date: Thu, 28 Oct 2021 23:58:13 +0200 Subject: [PATCH] bullseye --- Dockerfile | 4 ++-- Jenkinsfile | 12 ++++++------ build.yaml | 5 ++--- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 30a2722..e32bf70 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM debian:stable as builder RUN set -xe;\ apt-get update &&\ apt-get install -y debootstrap &&\ - debootstrap --include=apt,ca-certificates,curl --foreign --variant=minbase buster /dest &&\ + debootstrap --include=apt,ca-certificates,curl --foreign --variant=minbase bullseye /dest &&\ sed -i 's/setup_proc//' /dest/debootstrap/suite-script FROM scratch as bootstrapped @@ -40,7 +40,7 @@ COPY --from=toolbuilder /dumb-init /usr/local/sbin/dumb-init COPY apt-install /bin/apt-install COPY checkupdates /bin/checkupdates CMD "bash" -LABEL version.debian=buster \ +LABEL version.debian=bullseyen \ version.gosu=$GOSU_VERSION \ version.dumb-init=$DUMB_INIT_VERSION \ build.date=$DATE diff --git a/Jenkinsfile b/Jenkinsfile index a4ee113..cf7afa9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ -version = "10" +version = "11" project = "debian" repo = "zknt" registry = "reg.zknt.org" @@ -14,15 +14,15 @@ pipeline { script { def customImage = docker.build(registry+'/'+repo+'/'+project, "--pull --build-arg VERSION=$version --build-arg DATE=$timeStamp .") customImage.push(version) - customImage.push("buster") + customImage.push("bullseye") customImage.push("stable") 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] + ":buster" - sh "docker push " + io_registry_image.split(/\:/)[0] + ":buster" + sh "docker image tag " + registry+'/'+repo+'/'+project+':'+version + ' ' + io_registry_image.split(/\:/)[0] + ":bullseye" + sh "docker push " + io_registry_image.split(/\:/)[0] + ":bullseye" sh "docker image tag " + registry+'/'+repo+'/'+project+':'+version + ' ' + io_registry_image.split(/\:/)[0] + ":stable" sh "docker push " + io_registry_image.split(/\:/)[0] + ":stable" } @@ -32,8 +32,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] + ":buster" - sh "docker push " + quay_image.split(/\:/)[0] + ":buster" + sh "docker image tag " + registry+'/'+repo+'/'+project+':'+version + ' ' + quay_image.split(/\:/)[0] + ":bullseye" + sh "docker push " + quay_image.split(/\:/)[0] + ":bullseye" sh "docker image tag " + registry+'/'+repo+'/'+project+':'+version + ' ' + quay_image.split(/\:/)[0] + ":stable" sh "docker push " + quay_image.split(/\:/)[0] + ":stable" } diff --git a/build.yaml b/build.yaml index ea58ab1..e3312c6 100644 --- a/build.yaml +++ b/build.yaml @@ -1,6 +1,5 @@ --- -version: 10 +version: 11 project: debian additional_tags: - - buster - - stable + - bullseye