Update mirrorlist and remove unnecessary fallback

Author: tianon

7/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: 2019-11-14
 ENV GCC_VERSION 7.5.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; \

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; \

9/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-12
 ENV GCC_VERSION 9.3.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; \

Dockerfile.template

@@ -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: placeholder
 ENV GCC_VERSION placeholder
@@ -63,11 +65,8 @@ RUN set -ex; \
 		return 1; \
 	}; \
 	\
-	_fetch "gcc-$GCC_VERSION/gcc-$GCC_VERSION.tar.%%TARBALL-COMPRESSION%%.sig" 'gcc.tar.%%TARBALL-COMPRESSION%%.sig' \
-# 6.5.0 (https://mirrors.kernel.org/gnu/gcc/6.5.0/), no gcc- prefix
-		|| _fetch "$GCC_VERSION/gcc-$GCC_VERSION.tar.%%TARBALL-COMPRESSION%%.sig"; \
-	_fetch "gcc-$GCC_VERSION/gcc-$GCC_VERSION.tar.%%TARBALL-COMPRESSION%%" 'gcc.tar.%%TARBALL-COMPRESSION%%' \
-		|| _fetch "$GCC_VERSION/gcc-$GCC_VERSION.tar.%%TARBALL-COMPRESSION%%" 'gcc.tar.%%TARBALL-COMPRESSION%%'; \
+	_fetch "gcc-$GCC_VERSION/gcc-$GCC_VERSION.tar.%%TARBALL-COMPRESSION%%.sig" 'gcc.tar.%%TARBALL-COMPRESSION%%.sig'; \
+	_fetch "gcc-$GCC_VERSION/gcc-$GCC_VERSION.tar.%%TARBALL-COMPRESSION%%" 'gcc.tar.%%TARBALL-COMPRESSION%%'; \
 	gpg --batch --verify gcc.tar.%%TARBALL-COMPRESSION%%.sig gcc.tar.%%TARBALL-COMPRESSION%%; \
 	mkdir -p /usr/src/gcc; \
 	tar -xf gcc.tar.%%TARBALL-COMPRESSION%% -C /usr/src/gcc --strip-components=1; \