From d772df55c6ffa0051929e9cfca17cd52cf8acdfc Mon Sep 17 00:00:00 2001 From: Stefano Stabellini Date: Fri, 11 Aug 2023 19:06:49 -0700 Subject: [PATCH] automation: switch from Debian unstable to bookworm Debian unstable used in the Xen containers is actually bookworm. Switching to bookworm which is now stable means we are not basing our containers on a moving target anymore. Signed-off-by: Stefano Stabellini Reviewed-by: Michal Orzel master commit: 8ab05119df02081f2b1c3ab471a33b9f931050ad master date: 2023-08-11 19:06:49 -0700 --- ...m32-gcc.dockerfile => bookworm-arm64v8-arm32-gcc.dockerfile} | 2 +- ...{unstable-arm64v8.dockerfile => bookworm-arm64v8.dockerfile} | 2 +- .../{unstable-i386.dockerfile => bookworm-i386.dockerfile} | 2 +- .../build/debian/{unstable.dockerfile => bookworm.dockerfile} | 2 +- automation/scripts/containerize | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename automation/build/debian/{unstable-arm64v8-arm32-gcc.dockerfile => bookworm-arm64v8-arm32-gcc.dockerfile} (94%) rename automation/build/debian/{unstable-arm64v8.dockerfile => bookworm-arm64v8.dockerfile} (97%) rename automation/build/debian/{unstable-i386.dockerfile => bookworm-i386.dockerfile} (97%) rename automation/build/debian/{unstable.dockerfile => bookworm.dockerfile} (98%) diff --git a/automation/build/debian/unstable-arm64v8-arm32-gcc.dockerfile b/automation/build/debian/bookworm-arm64v8-arm32-gcc.dockerfile similarity index 94% rename from automation/build/debian/unstable-arm64v8-arm32-gcc.dockerfile rename to automation/build/debian/bookworm-arm64v8-arm32-gcc.dockerfile index 11860425a6..b3295c435e 100644 --- a/automation/build/debian/unstable-arm64v8-arm32-gcc.dockerfile +++ b/automation/build/debian/bookworm-arm64v8-arm32-gcc.dockerfile @@ -1,4 +1,4 @@ -FROM arm64v8/debian:unstable +FROM arm64v8/debian:bookworm LABEL maintainer.name="The Xen Project" \ maintainer.email="xen-devel@lists.xenproject.org" diff --git a/automation/build/debian/unstable-arm64v8.dockerfile b/automation/build/debian/bookworm-arm64v8.dockerfile similarity index 97% rename from automation/build/debian/unstable-arm64v8.dockerfile rename to automation/build/debian/bookworm-arm64v8.dockerfile index 5c73458d9d..aa5566504d 100644 --- a/automation/build/debian/unstable-arm64v8.dockerfile +++ b/automation/build/debian/bookworm-arm64v8.dockerfile @@ -1,4 +1,4 @@ -FROM arm64v8/debian:unstable +FROM arm64v8/debian:bookworm LABEL maintainer.name="The Xen Project" \ maintainer.email="xen-devel@lists.xenproject.org" diff --git a/automation/build/debian/unstable-i386.dockerfile b/automation/build/debian/bookworm-i386.dockerfile similarity index 97% rename from automation/build/debian/unstable-i386.dockerfile rename to automation/build/debian/bookworm-i386.dockerfile index 6ce54a481b..f663f0ef48 100644 --- a/automation/build/debian/unstable-i386.dockerfile +++ b/automation/build/debian/bookworm-i386.dockerfile @@ -1,4 +1,4 @@ -FROM i386/debian:unstable +FROM i386/debian:bookworm LABEL maintainer.name="The Xen Project" \ maintainer.email="xen-devel@lists.xenproject.org" diff --git a/automation/build/debian/unstable.dockerfile b/automation/build/debian/bookworm.dockerfile similarity index 98% rename from automation/build/debian/unstable.dockerfile rename to automation/build/debian/bookworm.dockerfile index b560337b7a..9f0c180b74 100644 --- a/automation/build/debian/unstable.dockerfile +++ b/automation/build/debian/bookworm.dockerfile @@ -1,4 +1,4 @@ -FROM debian:unstable +FROM debian:bookworm LABEL maintainer.name="The Xen Project" \ maintainer.email="xen-devel@lists.xenproject.org" diff --git a/automation/scripts/containerize b/automation/scripts/containerize index 9d4beca4fa..bb0f150ef2 100755 --- a/automation/scripts/containerize +++ b/automation/scripts/containerize @@ -34,7 +34,7 @@ case "_${CONTAINER}" in _jessie) CONTAINER="${BASE}/debian:jessie" ;; _stretch|_) CONTAINER="${BASE}/debian:stretch" ;; _buster-gcc-ibt) CONTAINER="${BASE}/debian:buster-gcc-ibt" ;; - _unstable|_) CONTAINER="${BASE}/debian:unstable" ;; + _bookworm|_) CONTAINER="${BASE}/debian:bookworm" ;; _trusty) CONTAINER="${BASE}/ubuntu:trusty" ;; _xenial) CONTAINER="${BASE}/ubuntu:xenial" ;; _opensuse-leap|_leap) CONTAINER="${BASE}/suse:opensuse-leap" ;; -- 2.39.5