Skip to content

Conversation

@tianon
Copy link
Member

@tianon tianon commented May 8, 2020

Changes:

@tianon
Copy link
Member Author

tianon commented May 8, 2020

Output from a diff-pr.sh adjustment I'm working on: 😈

diff --git a/_bashbrew-cat b/_bashbrew-cat
index e681bfc..84c6f5c 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,22 +1,22 @@
 Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <[email protected]> (@yosifkit)
 GitRepo: https://github.com/docker-library/gcc.git
 
-Tags: 6.5.0, 6.5, 6
-Architectures: amd64, arm32v5, arm32v7
-GitCommit: e17fd3097b743216f292e50ea8e84b3b3bcc4e53
-Directory: 6
-
 Tags: 7.5.0, 7.5, 7
-Architectures: amd64, arm32v5, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: aab71caeb1be048b44fd140a102cb7f17f995276
+Architectures: amd64, arm32v5, arm32v7, arm64v8, mips64le, ppc64le, s390x
+GitCommit: 05aef2fc627328e12bbf77aca44fd399a22c7fc4
 Directory: 7
 
 Tags: 8.4.0, 8.4, 8
-Architectures: amd64, arm32v5, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: f3db0f591ce42dd2ac3aec240ca47c87762bc385
+Architectures: amd64, arm32v5, arm32v7, arm64v8, mips64le, ppc64le, s390x
+GitCommit: 05aef2fc627328e12bbf77aca44fd399a22c7fc4
 Directory: 8
 
-Tags: 9.3.0, 9.3, 9, latest
-Architectures: amd64, arm32v5, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: d9a58942c8ff2c5c5a01e16bf0ffdf5e5dc61277
+Tags: 9.3.0, 9.3, 9
+Architectures: amd64, arm32v5, arm32v7, arm64v8, mips64le, ppc64le, s390x
+GitCommit: 05aef2fc627328e12bbf77aca44fd399a22c7fc4
 Directory: 9
+
+Tags: 10.1.0, 10.1, 10, latest
+Architectures: amd64, arm32v5, arm32v7, arm64v8, mips64le, ppc64le, s390x
+GitCommit: 97b046b578bd86cae5414d80b3ad0027c590aebd
+Directory: 10

@yosifkit
Copy link
Member

yosifkit commented May 8, 2020

After GCC 7.5 is released, no further GCC7 updates are expected.
https://www.phoronix.com/scan.php?page=news_item&px=GCC-7.5-Release-Candidate

@tianon
Copy link
Member Author

tianon commented May 8, 2020

Hmm, https://gcc.gnu.org/legacy-ml/gcc/2019-11/msg00038.html is pretty close, but I'd love to see a real official notice that 7 actually did get closed. 😕

@tianon
Copy link
Member Author

tianon commented May 8, 2020

Aha: https://gcc.gnu.org/legacy-ml/gcc/2019-11/msg00099.html

This is also the last release from the GCC 7 branch which will receive no further fixes from now on.

Changes:

- docker-library/gcc@36b9d23: Remove GCC 7
- docker-library/gcc@fd2dbbe: Sort version numbers with the highest first
- docker-library/gcc@97b046b: Add 10.1.0
- docker-library/gcc@3aed962: Improve generate-stackbrew-library.sh
- docker-library/gcc@05aef2f: Update mirrorlist and remove unnecessary fallback
- docker-library/gcc@f67402e: Improve update.sh to no longer create a temporary file (but still have nice debuggability via "bash -x")
- docker-library/gcc@48d2a53: Remove GCC 6 (Last Modified: 2018-10-30, Docker EOL: 2020-04-30)
- docker-library/gcc@de06dd2: Merge pull request docker-library/gcc#66 from docker-library/github-actions
- docker-library/gcc@f211dc2: Add intial GitHub Actions CI
@tianon
Copy link
Member Author

tianon commented May 8, 2020

https://gcc.gnu.org/pipermail/gcc/2020-March/232255.html

History makes us expect a GCC 8.5 release in fall of this year and it will be the last release from the GCC 8 series.

@tianon
Copy link
Member Author

tianon commented May 8, 2020

Diff:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index e681bfc..7227ac7 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,22 +1,17 @@
 Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <[email protected]> (@yosifkit)
 GitRepo: https://github.com/docker-library/gcc.git
 
-Tags: 6.5.0, 6.5, 6
-Architectures: amd64, arm32v5, arm32v7
-GitCommit: e17fd3097b743216f292e50ea8e84b3b3bcc4e53
-Directory: 6
-
-Tags: 7.5.0, 7.5, 7
-Architectures: amd64, arm32v5, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: aab71caeb1be048b44fd140a102cb7f17f995276
-Directory: 7
-
 Tags: 8.4.0, 8.4, 8
-Architectures: amd64, arm32v5, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: f3db0f591ce42dd2ac3aec240ca47c87762bc385
+Architectures: amd64, arm32v5, arm32v7, arm64v8, mips64le, ppc64le, s390x
+GitCommit: 05aef2fc627328e12bbf77aca44fd399a22c7fc4
 Directory: 8
 
-Tags: 9.3.0, 9.3, 9, latest
-Architectures: amd64, arm32v5, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: d9a58942c8ff2c5c5a01e16bf0ffdf5e5dc61277
+Tags: 9.3.0, 9.3, 9
+Architectures: amd64, arm32v5, arm32v7, arm64v8, mips64le, ppc64le, s390x
+GitCommit: 05aef2fc627328e12bbf77aca44fd399a22c7fc4
 Directory: 9
+
+Tags: 10.1.0, 10.1, 10, latest
+Architectures: amd64, arm32v5, arm32v7, arm64v8, mips64le, ppc64le, s390x
+GitCommit: 97b046b578bd86cae5414d80b3ad0027c590aebd
+Directory: 10
diff --git a/_bashbrew-list b/_bashbrew-list
index 9aececa..04ad439 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,13 +1,10 @@
-gcc:6
-gcc:6.5
-gcc:6.5.0
-gcc:7
-gcc:7.5
-gcc:7.5.0
 gcc:8
 gcc:8.4
 gcc:8.4.0
 gcc:9
 gcc:9.3
 gcc:9.3.0
+gcc:10
+gcc:10.1
+gcc:10.1.0
 gcc:latest
diff --git a/gcc_6/Dockerfile b/gcc_6/Dockerfile
deleted file mode 100644
index b043f7f..0000000
diff --git a/gcc_8/Dockerfile b/gcc_8/Dockerfile
index 8bf113f..655a4c6 100644
--- a/gcc_8/Dockerfile
+++ b/gcc_8/Dockerfile
@@ -32,10 +32,12 @@ RUN set -ex; \
 # https://gcc.gnu.org/mirrors.html
 ENV GCC_MIRRORS \
 		https://ftpmirror.gnu.org/gcc \
+		https://mirrors.kernel.org/gnu/gcc \
 		https://bigsearcher.com/mirrors/gcc/releases \
-		https://mirrors-usa.go-parts.com/gcc/releases \
-		https://mirrors.concertpass.com/gcc/releases \
-		http://www.netgull.com/gcc/releases
+		http://www.netgull.com/gcc/releases \
+		https://ftpmirror.gnu.org/gcc \
+# only attempt the origin FTP as a mirror of last resort
+		ftp://ftp.gnu.org/gnu/gcc
 
 # Last Modified: 2020-03-04
 ENV GCC_VERSION 8.4.0
@@ -63,11 +65,8 @@ RUN set -ex; \
 		return 1; \
 	}; \
 	\
-	_fetch "gcc-$GCC_VERSION/gcc-$GCC_VERSION.tar.xz.sig" 'gcc.tar.xz.sig' \
-# 6.5.0 (https://mirrors.kernel.org/gnu/gcc/6.5.0/), no gcc- prefix
-		|| _fetch "$GCC_VERSION/gcc-$GCC_VERSION.tar.xz.sig"; \
-	_fetch "gcc-$GCC_VERSION/gcc-$GCC_VERSION.tar.xz" 'gcc.tar.xz' \
-		|| _fetch "$GCC_VERSION/gcc-$GCC_VERSION.tar.xz" 'gcc.tar.xz'; \
+	_fetch "gcc-$GCC_VERSION/gcc-$GCC_VERSION.tar.xz.sig" 'gcc.tar.xz.sig'; \
+	_fetch "gcc-$GCC_VERSION/gcc-$GCC_VERSION.tar.xz" 'gcc.tar.xz'; \
 	gpg --batch --verify gcc.tar.xz.sig gcc.tar.xz; \
 	mkdir -p /usr/src/gcc; \
 	tar -xf gcc.tar.xz -C /usr/src/gcc --strip-components=1; \
diff --git a/gcc_7/Dockerfile b/gcc_9/Dockerfile
similarity index 91%
rename from gcc_7/Dockerfile
rename to gcc_9/Dockerfile
index 522e14d..5e891df 100644
--- a/gcc_7/Dockerfile
+++ b/gcc_9/Dockerfile
@@ -32,14 +32,16 @@ RUN set -ex; \
 # https://gcc.gnu.org/mirrors.html
 ENV GCC_MIRRORS \
 		https://ftpmirror.gnu.org/gcc \
+		https://mirrors.kernel.org/gnu/gcc \
 		https://bigsearcher.com/mirrors/gcc/releases \
-		https://mirrors-usa.go-parts.com/gcc/releases \
-		https://mirrors.concertpass.com/gcc/releases \
-		http://www.netgull.com/gcc/releases
+		http://www.netgull.com/gcc/releases \
+		https://ftpmirror.gnu.org/gcc \
+# only attempt the origin FTP as a mirror of last resort
+		ftp://ftp.gnu.org/gnu/gcc
 
-# Last Modified: 2019-11-14
-ENV GCC_VERSION 7.5.0
-# Docker EOL: 2021-05-14
+# Last Modified: 2020-03-12
+ENV GCC_VERSION 9.3.0
+# Docker EOL: 2021-09-12
 
 RUN set -ex; \
 	\
@@ -63,11 +65,8 @@ RUN set -ex; \
 		return 1; \
 	}; \
 	\
-	_fetch "gcc-$GCC_VERSION/gcc-$GCC_VERSION.tar.xz.sig" 'gcc.tar.xz.sig' \
-# 6.5.0 (https://mirrors.kernel.org/gnu/gcc/6.5.0/), no gcc- prefix
-		|| _fetch "$GCC_VERSION/gcc-$GCC_VERSION.tar.xz.sig"; \
-	_fetch "gcc-$GCC_VERSION/gcc-$GCC_VERSION.tar.xz" 'gcc.tar.xz' \
-		|| _fetch "$GCC_VERSION/gcc-$GCC_VERSION.tar.xz" 'gcc.tar.xz'; \
+	_fetch "gcc-$GCC_VERSION/gcc-$GCC_VERSION.tar.xz.sig" 'gcc.tar.xz.sig'; \
+	_fetch "gcc-$GCC_VERSION/gcc-$GCC_VERSION.tar.xz" 'gcc.tar.xz'; \
 	gpg --batch --verify gcc.tar.xz.sig gcc.tar.xz; \
 	mkdir -p /usr/src/gcc; \
 	tar -xf gcc.tar.xz -C /usr/src/gcc --strip-components=1; \
diff --git a/gcc_latest/Dockerfile b/gcc_latest/Dockerfile
index 1d570aa..bff0638 100644
--- a/gcc_latest/Dockerfile
+++ b/gcc_latest/Dockerfile
@@ -32,14 +32,16 @@ RUN set -ex; \
 # https://gcc.gnu.org/mirrors.html
 ENV GCC_MIRRORS \
 		https://ftpmirror.gnu.org/gcc \
+		https://mirrors.kernel.org/gnu/gcc \
 		https://bigsearcher.com/mirrors/gcc/releases \
-		https://mirrors-usa.go-parts.com/gcc/releases \
-		https://mirrors.concertpass.com/gcc/releases \
-		http://www.netgull.com/gcc/releases
+		http://www.netgull.com/gcc/releases \
+		https://ftpmirror.gnu.org/gcc \
+# only attempt the origin FTP as a mirror of last resort
+		ftp://ftp.gnu.org/gnu/gcc
 
-# Last Modified: 2020-03-12
-ENV GCC_VERSION 9.3.0
-# Docker EOL: 2021-09-12
+# Last Modified: 2020-05-07
+ENV GCC_VERSION 10.1.0
+# Docker EOL: 2021-11-07
 
 RUN set -ex; \
 	\
@@ -63,11 +65,8 @@ RUN set -ex; \
 		return 1; \
 	}; \
 	\
-	_fetch "gcc-$GCC_VERSION/gcc-$GCC_VERSION.tar.xz.sig" 'gcc.tar.xz.sig' \
-# 6.5.0 (https://mirrors.kernel.org/gnu/gcc/6.5.0/), no gcc- prefix
-		|| _fetch "$GCC_VERSION/gcc-$GCC_VERSION.tar.xz.sig"; \
-	_fetch "gcc-$GCC_VERSION/gcc-$GCC_VERSION.tar.xz" 'gcc.tar.xz' \
-		|| _fetch "$GCC_VERSION/gcc-$GCC_VERSION.tar.xz" 'gcc.tar.xz'; \
+	_fetch "gcc-$GCC_VERSION/gcc-$GCC_VERSION.tar.xz.sig" 'gcc.tar.xz.sig'; \
+	_fetch "gcc-$GCC_VERSION/gcc-$GCC_VERSION.tar.xz" 'gcc.tar.xz'; \
 	gpg --batch --verify gcc.tar.xz.sig gcc.tar.xz; \
 	mkdir -p /usr/src/gcc; \
 	tar -xf gcc.tar.xz -C /usr/src/gcc --strip-components=1; \

@github-actions
Copy link

github-actions bot commented May 8, 2020

Diff for 4899545:
diff --git a/_bashbrew-arches b/_bashbrew-arches
index a74789a..d05f9e0 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,21 +1,21 @@
-gcc:6 @ amd64
-gcc:6 @ arm32v5
-gcc:6 @ arm32v7
-gcc:7 @ amd64
-gcc:7 @ arm32v5
-gcc:7 @ arm32v7
-gcc:7 @ arm64v8
-gcc:7 @ ppc64le
-gcc:7 @ s390x
 gcc:8 @ amd64
 gcc:8 @ arm32v5
 gcc:8 @ arm32v7
 gcc:8 @ arm64v8
+gcc:8 @ mips64le
 gcc:8 @ ppc64le
 gcc:8 @ s390x
+gcc:9 @ amd64
+gcc:9 @ arm32v5
+gcc:9 @ arm32v7
+gcc:9 @ arm64v8
+gcc:9 @ mips64le
+gcc:9 @ ppc64le
+gcc:9 @ s390x
 gcc:latest @ amd64
 gcc:latest @ arm32v5
 gcc:latest @ arm32v7
 gcc:latest @ arm64v8
+gcc:latest @ mips64le
 gcc:latest @ ppc64le
 gcc:latest @ s390x
diff --git a/_bashbrew-list b/_bashbrew-list
index 9aececa..04ad439 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,13 +1,10 @@
-gcc:6
-gcc:6.5
-gcc:6.5.0
-gcc:7
-gcc:7.5
-gcc:7.5.0
 gcc:8
 gcc:8.4
 gcc:8.4.0
 gcc:9
 gcc:9.3
 gcc:9.3.0
+gcc:10
+gcc:10.1
+gcc:10.1.0
 gcc:latest
diff --git a/gcc_6/Dockerfile b/gcc_6/Dockerfile
deleted file mode 100644
index b043f7f..0000000
diff --git a/gcc_8/Dockerfile b/gcc_8/Dockerfile
index 8bf113f..655a4c6 100644
--- a/gcc_8/Dockerfile
+++ b/gcc_8/Dockerfile
@@ -32,10 +32,12 @@ RUN set -ex; \
 # https://gcc.gnu.org/mirrors.html
 ENV GCC_MIRRORS \
 		https://ftpmirror.gnu.org/gcc \
+		https://mirrors.kernel.org/gnu/gcc \
 		https://bigsearcher.com/mirrors/gcc/releases \
-		https://mirrors-usa.go-parts.com/gcc/releases \
-		https://mirrors.concertpass.com/gcc/releases \
-		http://www.netgull.com/gcc/releases
+		http://www.netgull.com/gcc/releases \
+		https://ftpmirror.gnu.org/gcc \
+# only attempt the origin FTP as a mirror of last resort
+		ftp://ftp.gnu.org/gnu/gcc
 
 # Last Modified: 2020-03-04
 ENV GCC_VERSION 8.4.0
@@ -63,11 +65,8 @@ RUN set -ex; \
 		return 1; \
 	}; \
 	\
-	_fetch "gcc-$GCC_VERSION/gcc-$GCC_VERSION.tar.xz.sig" 'gcc.tar.xz.sig' \
-# 6.5.0 (https://mirrors.kernel.org/gnu/gcc/6.5.0/), no gcc- prefix
-		|| _fetch "$GCC_VERSION/gcc-$GCC_VERSION.tar.xz.sig"; \
-	_fetch "gcc-$GCC_VERSION/gcc-$GCC_VERSION.tar.xz" 'gcc.tar.xz' \
-		|| _fetch "$GCC_VERSION/gcc-$GCC_VERSION.tar.xz" 'gcc.tar.xz'; \
+	_fetch "gcc-$GCC_VERSION/gcc-$GCC_VERSION.tar.xz.sig" 'gcc.tar.xz.sig'; \
+	_fetch "gcc-$GCC_VERSION/gcc-$GCC_VERSION.tar.xz" 'gcc.tar.xz'; \
 	gpg --batch --verify gcc.tar.xz.sig gcc.tar.xz; \
 	mkdir -p /usr/src/gcc; \
 	tar -xf gcc.tar.xz -C /usr/src/gcc --strip-components=1; \
diff --git a/gcc_7/Dockerfile b/gcc_9/Dockerfile
similarity index 91%
rename from gcc_7/Dockerfile
rename to gcc_9/Dockerfile
index 522e14d..5e891df 100644
--- a/gcc_7/Dockerfile
+++ b/gcc_9/Dockerfile
@@ -32,14 +32,16 @@ RUN set -ex; \
 # https://gcc.gnu.org/mirrors.html
 ENV GCC_MIRRORS \
 		https://ftpmirror.gnu.org/gcc \
+		https://mirrors.kernel.org/gnu/gcc \
 		https://bigsearcher.com/mirrors/gcc/releases \
-		https://mirrors-usa.go-parts.com/gcc/releases \
-		https://mirrors.concertpass.com/gcc/releases \
-		http://www.netgull.com/gcc/releases
+		http://www.netgull.com/gcc/releases \
+		https://ftpmirror.gnu.org/gcc \
+# only attempt the origin FTP as a mirror of last resort
+		ftp://ftp.gnu.org/gnu/gcc
 
-# Last Modified: 2019-11-14
-ENV GCC_VERSION 7.5.0
-# Docker EOL: 2021-05-14
+# Last Modified: 2020-03-12
+ENV GCC_VERSION 9.3.0
+# Docker EOL: 2021-09-12
 
 RUN set -ex; \
 	\
@@ -63,11 +65,8 @@ RUN set -ex; \
 		return 1; \
 	}; \
 	\
-	_fetch "gcc-$GCC_VERSION/gcc-$GCC_VERSION.tar.xz.sig" 'gcc.tar.xz.sig' \
-# 6.5.0 (https://mirrors.kernel.org/gnu/gcc/6.5.0/), no gcc- prefix
-		|| _fetch "$GCC_VERSION/gcc-$GCC_VERSION.tar.xz.sig"; \
-	_fetch "gcc-$GCC_VERSION/gcc-$GCC_VERSION.tar.xz" 'gcc.tar.xz' \
-		|| _fetch "$GCC_VERSION/gcc-$GCC_VERSION.tar.xz" 'gcc.tar.xz'; \
+	_fetch "gcc-$GCC_VERSION/gcc-$GCC_VERSION.tar.xz.sig" 'gcc.tar.xz.sig'; \
+	_fetch "gcc-$GCC_VERSION/gcc-$GCC_VERSION.tar.xz" 'gcc.tar.xz'; \
 	gpg --batch --verify gcc.tar.xz.sig gcc.tar.xz; \
 	mkdir -p /usr/src/gcc; \
 	tar -xf gcc.tar.xz -C /usr/src/gcc --strip-components=1; \
diff --git a/gcc_latest/Dockerfile b/gcc_latest/Dockerfile
index 1d570aa..bff0638 100644
--- a/gcc_latest/Dockerfile
+++ b/gcc_latest/Dockerfile
@@ -32,14 +32,16 @@ RUN set -ex; \
 # https://gcc.gnu.org/mirrors.html
 ENV GCC_MIRRORS \
 		https://ftpmirror.gnu.org/gcc \
+		https://mirrors.kernel.org/gnu/gcc \
 		https://bigsearcher.com/mirrors/gcc/releases \
-		https://mirrors-usa.go-parts.com/gcc/releases \
-		https://mirrors.concertpass.com/gcc/releases \
-		http://www.netgull.com/gcc/releases
+		http://www.netgull.com/gcc/releases \
+		https://ftpmirror.gnu.org/gcc \
+# only attempt the origin FTP as a mirror of last resort
+		ftp://ftp.gnu.org/gnu/gcc
 
-# Last Modified: 2020-03-12
-ENV GCC_VERSION 9.3.0
-# Docker EOL: 2021-09-12
+# Last Modified: 2020-05-07
+ENV GCC_VERSION 10.1.0
+# Docker EOL: 2021-11-07
 
 RUN set -ex; \
 	\
@@ -63,11 +65,8 @@ RUN set -ex; \
 		return 1; \
 	}; \
 	\
-	_fetch "gcc-$GCC_VERSION/gcc-$GCC_VERSION.tar.xz.sig" 'gcc.tar.xz.sig' \
-# 6.5.0 (https://mirrors.kernel.org/gnu/gcc/6.5.0/), no gcc- prefix
-		|| _fetch "$GCC_VERSION/gcc-$GCC_VERSION.tar.xz.sig"; \
-	_fetch "gcc-$GCC_VERSION/gcc-$GCC_VERSION.tar.xz" 'gcc.tar.xz' \
-		|| _fetch "$GCC_VERSION/gcc-$GCC_VERSION.tar.xz" 'gcc.tar.xz'; \
+	_fetch "gcc-$GCC_VERSION/gcc-$GCC_VERSION.tar.xz.sig" 'gcc.tar.xz.sig'; \
+	_fetch "gcc-$GCC_VERSION/gcc-$GCC_VERSION.tar.xz" 'gcc.tar.xz'; \
 	gpg --batch --verify gcc.tar.xz.sig gcc.tar.xz; \
 	mkdir -p /usr/src/gcc; \
 	tar -xf gcc.tar.xz -C /usr/src/gcc --strip-components=1; \

@yosifkit yosifkit merged commit e9e3558 into docker-library:master May 8, 2020
@yosifkit yosifkit deleted the gcc branch May 8, 2020 17:53
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