From 970151c4c889b860ea8c64a58c56097d5d03f55e Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Sun, 26 Nov 2023 16:40:59 +0000
Subject: [PATCH] fix: VERSION_ID to VERSION_CODENAME
---
containers/debian/base.Dockerfile | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/containers/debian/base.Dockerfile b/containers/debian/base.Dockerfile
index f25a14aae..33506a4f6 100644
--- a/containers/debian/base.Dockerfile
+++ b/containers/debian/base.Dockerfile
@@ -75,16 +75,17 @@ mkdir -p /etc/apt/source.list.d
# GCC version and repository
case ${ID} in
debian)
- case ${VERSION_ID} in
- 12) GCC="-12" ;;
- *) echo "Unsupported VERSION_ID=${VERSION_ID}" ; exit 1 ;;
+ case ${VERSION_CODENAME} in
+ bookworm) GCC="-12" ;;
+ trixie) GCC="-13" ;;
+ *) echo "Unsupported VERSION_CODENAME=${VERSION_CODENAME}" ; exit 1 ;;
esac ;;
ubuntu)
echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/ppa/ubuntu/${VERSION_CODENAME} main" > /etc/apt/source.list.d/ubuntu-toolchain.list
- case ${VERSION_ID} in
- 20.04) GCC="-10" ;;
- 22.04) GCC="-12" ;;
- *) echo "Unsupported VERSION_ID=${VERSION_ID}" ; exit 1 ;;
+ case ${VERSION_CODENAME} in
+ focal) GCC="-10" ;;
+ jammy) GCC="-12" ;;
+ *) echo "Unsupported VERSION_CODENAME=${VERSION_CODENAME}" ; exit 1 ;;
esac ;;
*) echo "Unsupported ID=${ID}" ; exit 1 ;;
esac
--
GitLab