From 47ea6259ee03f28639ffb493b847067689d59c2e Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 16 Jan 2024 10:43:13 -0800 Subject: [PATCH] Update Apache project mirrors See https://apache.org/history/mirror-history.html --- 3.0/Dockerfile | 8 +++----- 3.11/Dockerfile | 8 +++----- 4.0/Dockerfile | 8 +++----- 4.1/Dockerfile | 8 +++----- 5.0/Dockerfile | 8 +++----- Dockerfile.template | 8 +++----- 6 files changed, 18 insertions(+), 30 deletions(-) diff --git a/3.0/Dockerfile b/3.0/Dockerfile index efb1d6c..f1b64ce 100644 --- a/3.0/Dockerfile +++ b/3.0/Dockerfile @@ -105,11 +105,9 @@ RUN set -eux; \ local success=; \ local distUrl=; \ for distUrl in \ -# https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394 - 'https://www.apache.org/dyn/closer.cgi?action=download&filename=' \ -# if the version is outdated (or we're grabbing the .asc file), we might have to pull from the dist/archive :/ - https://www-us.apache.org/dist/ \ - https://www.apache.org/dist/ \ +# https://github.com/docker-library/tomcat/pull/308 + https://dlcdn.apache.org/ \ +# if the version is outdated, we have to pull from the archive https://archive.apache.org/dist/ \ ; do \ if wget --progress=dot:giga -O "$f" "$distUrl$distFile" && [ -s "$f" ]; then \ diff --git a/3.11/Dockerfile b/3.11/Dockerfile index ee83e64..d230a09 100644 --- a/3.11/Dockerfile +++ b/3.11/Dockerfile @@ -105,11 +105,9 @@ RUN set -eux; \ local success=; \ local distUrl=; \ for distUrl in \ -# https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394 - 'https://www.apache.org/dyn/closer.cgi?action=download&filename=' \ -# if the version is outdated (or we're grabbing the .asc file), we might have to pull from the dist/archive :/ - https://www-us.apache.org/dist/ \ - https://www.apache.org/dist/ \ +# https://github.com/docker-library/tomcat/pull/308 + https://dlcdn.apache.org/ \ +# if the version is outdated, we have to pull from the archive https://archive.apache.org/dist/ \ ; do \ if wget --progress=dot:giga -O "$f" "$distUrl$distFile" && [ -s "$f" ]; then \ diff --git a/4.0/Dockerfile b/4.0/Dockerfile index 98b21a1..bd4c41b 100644 --- a/4.0/Dockerfile +++ b/4.0/Dockerfile @@ -105,11 +105,9 @@ RUN set -eux; \ local success=; \ local distUrl=; \ for distUrl in \ -# https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394 - 'https://www.apache.org/dyn/closer.cgi?action=download&filename=' \ -# if the version is outdated (or we're grabbing the .asc file), we might have to pull from the dist/archive :/ - https://www-us.apache.org/dist/ \ - https://www.apache.org/dist/ \ +# https://github.com/docker-library/tomcat/pull/308 + https://dlcdn.apache.org/ \ +# if the version is outdated, we have to pull from the archive https://archive.apache.org/dist/ \ ; do \ if wget --progress=dot:giga -O "$f" "$distUrl$distFile" && [ -s "$f" ]; then \ diff --git a/4.1/Dockerfile b/4.1/Dockerfile index ee6dd60..e12c9fe 100644 --- a/4.1/Dockerfile +++ b/4.1/Dockerfile @@ -105,11 +105,9 @@ RUN set -eux; \ local success=; \ local distUrl=; \ for distUrl in \ -# https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394 - 'https://www.apache.org/dyn/closer.cgi?action=download&filename=' \ -# if the version is outdated (or we're grabbing the .asc file), we might have to pull from the dist/archive :/ - https://www-us.apache.org/dist/ \ - https://www.apache.org/dist/ \ +# https://github.com/docker-library/tomcat/pull/308 + https://dlcdn.apache.org/ \ +# if the version is outdated, we have to pull from the archive https://archive.apache.org/dist/ \ ; do \ if wget --progress=dot:giga -O "$f" "$distUrl$distFile" && [ -s "$f" ]; then \ diff --git a/5.0/Dockerfile b/5.0/Dockerfile index e892b86..88643ef 100644 --- a/5.0/Dockerfile +++ b/5.0/Dockerfile @@ -105,11 +105,9 @@ RUN set -eux; \ local success=; \ local distUrl=; \ for distUrl in \ -# https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394 - 'https://www.apache.org/dyn/closer.cgi?action=download&filename=' \ -# if the version is outdated (or we're grabbing the .asc file), we might have to pull from the dist/archive :/ - https://www-us.apache.org/dist/ \ - https://www.apache.org/dist/ \ +# https://github.com/docker-library/tomcat/pull/308 + https://dlcdn.apache.org/ \ +# if the version is outdated, we have to pull from the archive https://archive.apache.org/dist/ \ ; do \ if wget --progress=dot:giga -O "$f" "$distUrl$distFile" && [ -s "$f" ]; then \ diff --git a/Dockerfile.template b/Dockerfile.template index 8674e6b..231b424 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -113,11 +113,9 @@ RUN set -eux; \ local success=; \ local distUrl=; \ for distUrl in \ -# https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394 - 'https://www.apache.org/dyn/closer.cgi?action=download&filename=' \ -# if the version is outdated (or we're grabbing the .asc file), we might have to pull from the dist/archive :/ - https://www-us.apache.org/dist/ \ - https://www.apache.org/dist/ \ +# https://github.com/docker-library/tomcat/pull/308 + https://dlcdn.apache.org/ \ +# if the version is outdated, we have to pull from the archive https://archive.apache.org/dist/ \ ; do \ if wget --progress=dot:giga -O "$f" "$distUrl$distFile" && [ -s "$f" ]; then \