Merge pull request #108 from infosiftr/eol-11

Remove EOL 11
docker-library · Jul 22, 2024 · 3583d3c · 3583d3c
2 parents f2681d9 + b5055bc
commit 3583d3c
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 190 deletions.
diff --git a/11/Dockerfile b/11/Dockerfile
diff --git a/12/Dockerfile b/12/Dockerfile
diff --git a/13/Dockerfile b/13/Dockerfile
diff --git a/14/Dockerfile b/14/Dockerfile
diff --git a/Dockerfile.template b/Dockerfile.template
@@ -97,22 +97,18 @@ RUN set -ex; \
 	extraConfigureArgs=''; \
 	dpkgArch="$(dpkg --print-architecture)"; \
 	case "$dpkgArch" in \
-# with-arch: https://salsa.debian.org/toolchain-team/gcc/-/blob/gcc-11-debian/debian/rules2#L462-502
-# with-float: https://salsa.debian.org/toolchain-team/gcc/-/blob/gcc-11-debian/debian/rules.defs#L502-512
-# with-mode: https://salsa.debian.org/toolchain-team/gcc/-/blob/gcc-11-debian/debian/rules.defs#L480
+# with-arch: https://salsa.debian.org/toolchain-team/gcc/-/blob/gcc-13-debian/debian/rules2#L533-573
+# with-float: https://salsa.debian.org/toolchain-team/gcc/-/blob/gcc-13-debian/debian/rules2#L521-523
+# with-mode: https://salsa.debian.org/toolchain-team/gcc/-/blob/gcc-13-debian/debian/rules2#L571
 		armel) \
 			extraConfigureArgs="$extraConfigureArgs --with-arch=armv5te --with-float=soft" \
 			;; \
 		armhf) \
-{{ if env.version | tonumber >= 11 then ( -}}
 			# https://bugs.launchpad.net/ubuntu/+source/gcc-defaults/+bug/1939379/comments/2
 			extraConfigureArgs="$extraConfigureArgs --with-arch=armv7-a+fp --with-float=hard --with-mode=thumb" \
-{{ ) else ( -}}
-			extraConfigureArgs="$extraConfigureArgs --with-arch=armv7-a --with-float=hard --with-fpu=vfpv3-d16 --with-mode=thumb" \
-{{ ) end -}}
 			;; \
 		\
-# with-arch-32: https://salsa.debian.org/toolchain-team/gcc/-/blob/gcc-11-debian/debian/rules2#L598
+# with-arch-32: https://salsa.debian.org/toolchain-team/gcc/-/blob/gcc-13-debian/debian/rules2#L670
 		i386) \
 			extraConfigureArgs="$extraConfigureArgs --with-arch-32=i686"; \
 			;; \

diff --git a/versions.json b/versions.json
@@ -1,13 +1,4 @@
 {
-  "11": {
-    "compression": "xz",
-    "debian": {
-      "version": "bullseye"
-    },
-    "eol": "2026-01-19",
-    "lastModified": "2024-07-19",
-    "version": "11.5.0"
-  },
   "12": {
     "compression": "xz",
     "debian": {

diff --git a/versions.sh b/versions.sh
@@ -8,9 +8,6 @@ set -Eeuo pipefail
 
 # defaultDebianSuite gets auto-declared below
 declare -A debianSuites=(
-# $ convert
-# convert: /usr/local/lib64/libstdc++.so.6: version `GLIBCXX_3.4.30' not found
-	[11]='bullseye'
 )
 
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"