Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update gcc #17028

Merged
merged 1 commit into from
Jun 22, 2024
Merged

Update gcc #17028

merged 1 commit into from
Jun 22, 2024

Conversation

tianon
Copy link
Member

@tianon tianon commented Jun 21, 2024

Changes:

Changes:

- docker-library/gcc@4a0eb64: Update 12 to 12.4.0
- docker-library/gcc@ba14e97: Merge pull request docker-library/gcc#107 from infosiftr/10-eol
- docker-library/gcc@7c21417: Remove 10 (end of life)
- docker-library/gcc@df37ca5: Merge pull request docker-library/gcc#106 from infosiftr/mirrors
- docker-library/gcc@dfd9a5f: Switch to upstream mirror for scraping version numbers
@tianon tianon requested a review from a team as a code owner June 21, 2024 17:27
Copy link

Diff for e6bb1c6:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index bc78056..969f7dd 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,27 +1,22 @@
 Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <[email protected]> (@yosifkit)
 GitRepo: https://github.com/docker-library/gcc.git
 
-Tags: 10.5.0, 10.5, 10, 10.5.0-bullseye, 10.5-bullseye, 10-bullseye
-Architectures: amd64, arm32v5, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: b1e7fc69e4021bab505d420fddc57002ef04939e
-Directory: 10
-
 Tags: 11.4.0, 11.4, 11, 11.4.0-bullseye, 11.4-bullseye, 11-bullseye
 Architectures: amd64, arm32v5, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: b1e7fc69e4021bab505d420fddc57002ef04939e
+GitCommit: dfd9a5f296cd45762afd9b9e098d293b12dc5193
 Directory: 11
 
-Tags: 12.3.0, 12.3, 12, 12.3.0-bookworm, 12.3-bookworm, 12-bookworm
+Tags: 12.4.0, 12.4, 12, 12.4.0-bookworm, 12.4-bookworm, 12-bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: b1e7fc69e4021bab505d420fddc57002ef04939e
+GitCommit: 4a0eb64954fed9990b723b618fa13f6b8f7762e3
 Directory: 12
 
 Tags: 13.3.0, 13.3, 13, 13.3.0-bookworm, 13.3-bookworm, 13-bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 6f09c34227daae15e71f398f0073e31f3ef74234
+GitCommit: dfd9a5f296cd45762afd9b9e098d293b12dc5193
 Directory: 13
 
 Tags: 14.1.0, 14.1, 14, latest, 14.1.0-bookworm, 14.1-bookworm, 14-bookworm, bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: b1e7fc69e4021bab505d420fddc57002ef04939e
+GitCommit: dfd9a5f296cd45762afd9b9e098d293b12dc5193
 Directory: 14
diff --git a/_bashbrew-list b/_bashbrew-list
index 45e438f..37c1b27 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,9 +1,3 @@
-gcc:10
-gcc:10-bullseye
-gcc:10.5
-gcc:10.5-bullseye
-gcc:10.5.0
-gcc:10.5.0-bullseye
 gcc:11
 gcc:11-bullseye
 gcc:11.4
@@ -12,10 +6,10 @@ gcc:11.4.0
 gcc:11.4.0-bullseye
 gcc:12
 gcc:12-bookworm
-gcc:12.3
-gcc:12.3-bookworm
-gcc:12.3.0
-gcc:12.3.0-bookworm
+gcc:12.4
+gcc:12.4-bookworm
+gcc:12.4.0
+gcc:12.4.0-bookworm
 gcc:13
 gcc:13-bookworm
 gcc:13.3
diff --git a/gcc_10-bullseye/Dockerfile b/gcc_10-bullseye/Dockerfile
deleted file mode 100644
index 7d70e20..0000000
diff --git a/gcc_11-bullseye/Dockerfile b/gcc_11-bullseye/Dockerfile
index 38edef2..5a7f9c4 100644
--- a/gcc_11-bullseye/Dockerfile
+++ b/gcc_11-bullseye/Dockerfile
@@ -38,6 +38,8 @@ ENV GCC_MIRRORS \
 		https://bigsearcher.com/mirrors/gcc/releases \
 		http://www.netgull.com/gcc/releases \
 		https://ftpmirror.gnu.org/gcc \
+# "sourceware.org" is the canonical upstream release host (the host of "gcc.gnu.org")
+		https://sourceware.org/pub/gcc/releases \
 # only attempt the origin FTP as a mirror of last resort
 		ftp://ftp.gnu.org/gnu/gcc
 
diff --git a/gcc_12-bookworm/Dockerfile b/gcc_12-bookworm/Dockerfile
index 9a2a008..e31cde7 100644
--- a/gcc_12-bookworm/Dockerfile
+++ b/gcc_12-bookworm/Dockerfile
@@ -38,12 +38,14 @@ ENV GCC_MIRRORS \
 		https://bigsearcher.com/mirrors/gcc/releases \
 		http://www.netgull.com/gcc/releases \
 		https://ftpmirror.gnu.org/gcc \
+# "sourceware.org" is the canonical upstream release host (the host of "gcc.gnu.org")
+		https://sourceware.org/pub/gcc/releases \
 # only attempt the origin FTP as a mirror of last resort
 		ftp://ftp.gnu.org/gnu/gcc
 
-# Last Modified: 2023-05-08
-ENV GCC_VERSION 12.3.0
-# Docker EOL: 2024-11-08
+# Last Modified: 2024-06-20
+ENV GCC_VERSION 12.4.0
+# Docker EOL: 2025-12-20
 
 RUN set -ex; \
 	\
diff --git a/gcc_13-bookworm/Dockerfile b/gcc_13-bookworm/Dockerfile
index df9ad6e..ee8540b 100644
--- a/gcc_13-bookworm/Dockerfile
+++ b/gcc_13-bookworm/Dockerfile
@@ -38,6 +38,8 @@ ENV GCC_MIRRORS \
 		https://bigsearcher.com/mirrors/gcc/releases \
 		http://www.netgull.com/gcc/releases \
 		https://ftpmirror.gnu.org/gcc \
+# "sourceware.org" is the canonical upstream release host (the host of "gcc.gnu.org")
+		https://sourceware.org/pub/gcc/releases \
 # only attempt the origin FTP as a mirror of last resort
 		ftp://ftp.gnu.org/gnu/gcc
 
diff --git a/gcc_bookworm/Dockerfile b/gcc_bookworm/Dockerfile
index a6ee3fa..37882cc 100644
--- a/gcc_bookworm/Dockerfile
+++ b/gcc_bookworm/Dockerfile
@@ -38,6 +38,8 @@ ENV GCC_MIRRORS \
 		https://bigsearcher.com/mirrors/gcc/releases \
 		http://www.netgull.com/gcc/releases \
 		https://ftpmirror.gnu.org/gcc \
+# "sourceware.org" is the canonical upstream release host (the host of "gcc.gnu.org")
+		https://sourceware.org/pub/gcc/releases \
 # only attempt the origin FTP as a mirror of last resort
 		ftp://ftp.gnu.org/gnu/gcc

Relevant Maintainers:

@yosifkit yosifkit merged commit ab034c9 into docker-library:master Jun 22, 2024
9 checks passed
@yosifkit yosifkit deleted the gcc branch June 22, 2024 00:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants