Add GCC 14 (remove 9)

docker-library · May 7, 2024 · 243999e · 243999e
1 parent fd0da24
commit 243999e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/9/Dockerfile → 14/Dockerfile b/9/Dockerfile → 14/Dockerfile
diff --git a/Dockerfile.template b/Dockerfile.template
@@ -136,6 +136,10 @@ RUN set -ex; \
 	bash -Eeuo pipefail -xc ' \
 		deb="$(strings /usr/lib/*/libstdc++.so* | grep "^GLIBC" | sort -u)"; \
 		gcc="$(strings /usr/local/lib*/libstdc++.so | grep "^GLIBC" | sort -u)"; \
+{{ if .debian.version == "bookworm" and (env.version | tonumber) >= 14 then ( -}}
+# https://github.com/docker-library/gcc/pull/103#issuecomment-2099134740 (using "comm" to avoid accidental partial matches / hairy "grep" regex)
+		deb="$(comm -23 <(cat <<<"$deb") <(echo "GLIBC_2.16"))"; \
+{{ ) else "" end -}}
 		diff="$(comm -23 <(cat <<<"$deb") <(cat <<<"$gcc"))"; \
 		test -z "$diff"; \
 	'

diff --git a/versions.json b/versions.json
@@ -35,13 +35,13 @@
     "lastModified": "2023-07-27",
     "version": "13.2.0"
   },
-  "9": {
+  "14": {
     "compression": "xz",
     "debian": {
-      "version": "bullseye"
+      "version": "bookworm"
     },
-    "eol": "2023-11-27",
-    "lastModified": "2022-05-27",
-    "version": "9.5.0"
+    "eol": "2025-11-07",
+    "lastModified": "2024-05-07",
+    "version": "14.1.0"
   }
 }