diff options
15 files changed, 17 insertions, 17 deletions
diff --git a/contrib/ci/generate-jobs b/contrib/ci/generate-jobs index b76e76c83..4871d005d 100755 --- a/contrib/ci/generate-jobs +++ b/contrib/ci/generate-jobs @@ -23,8 +23,8 @@ BUILD_FOR=( ) declare -A DISTRO_IMAGES; -DISTRO_IMAGES['debian']='docker.io/debian'; -DISTRO_IMAGES['archlinux']='docker.io/archlinux'; +DISTRO_IMAGES['debian']='docker.io/library/debian'; +DISTRO_IMAGES['archlinux']='docker.io/library/archlinux'; chmod +w -R $CI_DIR/jobs; rm -rf $CI_DIR/jobs/*-generated; @@ -52,7 +52,7 @@ for TARGET in "${BUILD_FOR[@]}"; do export DISTRO=$(awk '{print $1}' <<< "$TARGET"); export CODENAME=$(awk '{print $2}' <<< "$TARGET"); export ARCH=$(awk '{print $3}' <<< "$TARGET"); - export OCI_IMAGE="${DISTRO_IMAGES[$DISTRO]}"; + export OCI_IMAGE="${DISTRO_IMAGES[$DISTRO]}:$CODENAME"; export DISTRO_TARGET="$CI_DIR/targets/$DISTRO"; if [[ -d "$DISTRO_TARGET/$CODENAME-$ARCH" ]]; then DISTRO_TARGET="$DISTRO_TARGET/$CODENAME-$ARCH"; diff --git a/contrib/ci/jobs/100-build-debian-bookworm-amd64-generated/Containerfile b/contrib/ci/jobs/100-build-debian-bookworm-amd64-generated/Containerfile index 6e2c93980..a7fe8a3ac 100644 --- a/contrib/ci/jobs/100-build-debian-bookworm-amd64-generated/Containerfile +++ b/contrib/ci/jobs/100-build-debian-bookworm-amd64-generated/Containerfile @@ -1,4 +1,4 @@ -FROM docker.io/debian +FROM docker.io/library/debian:bookworm ENV DEBIAN_FRONTEND=noninteractive diff --git a/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-generated/Containerfile b/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-generated/Containerfile index 6e2c93980..a7fe8a3ac 100644 --- a/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-generated/Containerfile +++ b/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-generated/Containerfile @@ -1,4 +1,4 @@ -FROM docker.io/debian +FROM docker.io/library/debian:bookworm ENV DEBIAN_FRONTEND=noninteractive diff --git a/contrib/ci/jobs/105-build-debian-bookworm-arm64-generated/Containerfile b/contrib/ci/jobs/105-build-debian-bookworm-arm64-generated/Containerfile index 6e2c93980..a7fe8a3ac 100644 --- a/contrib/ci/jobs/105-build-debian-bookworm-arm64-generated/Containerfile +++ b/contrib/ci/jobs/105-build-debian-bookworm-arm64-generated/Containerfile @@ -1,4 +1,4 @@ -FROM docker.io/debian +FROM docker.io/library/debian:bookworm ENV DEBIAN_FRONTEND=noninteractive diff --git a/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-generated/Containerfile b/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-generated/Containerfile index 6e2c93980..a7fe8a3ac 100644 --- a/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-generated/Containerfile +++ b/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-generated/Containerfile @@ -1,4 +1,4 @@ -FROM docker.io/debian +FROM docker.io/library/debian:bookworm ENV DEBIAN_FRONTEND=noninteractive diff --git a/contrib/ci/jobs/110-build-debian-trixie-amd64-generated/Containerfile b/contrib/ci/jobs/110-build-debian-trixie-amd64-generated/Containerfile index 6e2c93980..dc6d84149 100644 --- a/contrib/ci/jobs/110-build-debian-trixie-amd64-generated/Containerfile +++ b/contrib/ci/jobs/110-build-debian-trixie-amd64-generated/Containerfile @@ -1,4 +1,4 @@ -FROM docker.io/debian +FROM docker.io/library/debian:trixie ENV DEBIAN_FRONTEND=noninteractive diff --git a/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-generated/Containerfile b/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-generated/Containerfile index 6e2c93980..dc6d84149 100644 --- a/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-generated/Containerfile +++ b/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-generated/Containerfile @@ -1,4 +1,4 @@ -FROM docker.io/debian +FROM docker.io/library/debian:trixie ENV DEBIAN_FRONTEND=noninteractive diff --git a/contrib/ci/jobs/115-build-debian-trixie-arm64-generated/Containerfile b/contrib/ci/jobs/115-build-debian-trixie-arm64-generated/Containerfile index 6e2c93980..dc6d84149 100644 --- a/contrib/ci/jobs/115-build-debian-trixie-arm64-generated/Containerfile +++ b/contrib/ci/jobs/115-build-debian-trixie-arm64-generated/Containerfile @@ -1,4 +1,4 @@ -FROM docker.io/debian +FROM docker.io/library/debian:trixie ENV DEBIAN_FRONTEND=noninteractive diff --git a/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-generated/Containerfile b/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-generated/Containerfile index 6e2c93980..dc6d84149 100644 --- a/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-generated/Containerfile +++ b/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-generated/Containerfile @@ -1,4 +1,4 @@ -FROM docker.io/debian +FROM docker.io/library/debian:trixie ENV DEBIAN_FRONTEND=noninteractive diff --git a/contrib/ci/jobs/120-build-debian-unstable-amd64-generated/Containerfile b/contrib/ci/jobs/120-build-debian-unstable-amd64-generated/Containerfile index 6e2c93980..c3bbade45 100644 --- a/contrib/ci/jobs/120-build-debian-unstable-amd64-generated/Containerfile +++ b/contrib/ci/jobs/120-build-debian-unstable-amd64-generated/Containerfile @@ -1,4 +1,4 @@ -FROM docker.io/debian +FROM docker.io/library/debian:unstable ENV DEBIAN_FRONTEND=noninteractive diff --git a/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-generated/Containerfile b/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-generated/Containerfile index 6e2c93980..c3bbade45 100644 --- a/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-generated/Containerfile +++ b/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-generated/Containerfile @@ -1,4 +1,4 @@ -FROM docker.io/debian +FROM docker.io/library/debian:unstable ENV DEBIAN_FRONTEND=noninteractive diff --git a/contrib/ci/jobs/125-build-debian-unstable-arm64-generated/Containerfile b/contrib/ci/jobs/125-build-debian-unstable-arm64-generated/Containerfile index 6e2c93980..c3bbade45 100644 --- a/contrib/ci/jobs/125-build-debian-unstable-arm64-generated/Containerfile +++ b/contrib/ci/jobs/125-build-debian-unstable-arm64-generated/Containerfile @@ -1,4 +1,4 @@ -FROM docker.io/debian +FROM docker.io/library/debian:unstable ENV DEBIAN_FRONTEND=noninteractive diff --git a/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-generated/Containerfile b/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-generated/Containerfile index 6e2c93980..c3bbade45 100644 --- a/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-generated/Containerfile +++ b/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-generated/Containerfile @@ -1,4 +1,4 @@ -FROM docker.io/debian +FROM docker.io/library/debian:unstable ENV DEBIAN_FRONTEND=noninteractive diff --git a/contrib/ci/jobs/130-build-debian-unstable-riscv64-generated/Containerfile b/contrib/ci/jobs/130-build-debian-unstable-riscv64-generated/Containerfile index 6e2c93980..c3bbade45 100644 --- a/contrib/ci/jobs/130-build-debian-unstable-riscv64-generated/Containerfile +++ b/contrib/ci/jobs/130-build-debian-unstable-riscv64-generated/Containerfile @@ -1,4 +1,4 @@ -FROM docker.io/debian +FROM docker.io/library/debian:unstable ENV DEBIAN_FRONTEND=noninteractive diff --git a/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-generated/Containerfile b/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-generated/Containerfile index 6e2c93980..c3bbade45 100644 --- a/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-generated/Containerfile +++ b/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-generated/Containerfile @@ -1,4 +1,4 @@ -FROM docker.io/debian +FROM docker.io/library/debian:unstable ENV DEBIAN_FRONTEND=noninteractive |