diff --git a/10.1/jdk11/temurin-jammy/Dockerfile b/10.1/jdk11/temurin-jammy/Dockerfile index aa0349cc5..b0e85e364 100644 --- a/10.1/jdk11/temurin-jammy/Dockerfile +++ b/10.1/jdk11/temurin-jammy/Dockerfile @@ -40,12 +40,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=$distFile" \ -# if the version is outdated (or we're grabbing the .asc file), we might have to pull from the dist/archive :/ - "https://downloads.apache.org/$distFile" \ - "https://www-us.apache.org/dist/$distFile" \ - "https://www.apache.org/dist/$distFile" \ +# https://apache.org/history/mirror-history.html + "https://dlcdn.apache.org/$distFile" \ +# if the version is outdated, we have to pull from the archive "https://archive.apache.org/dist/$distFile" \ # if all else fails, let's try Maven (https://www.mail-archive.com/users@tomcat.apache.org/msg134940.html; https://mvnrepository.com/artifact/org.apache.tomcat/tomcat; https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/) ${mvnFile:+"https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/$mvnFile"} \ diff --git a/10.1/jdk17/temurin-jammy/Dockerfile b/10.1/jdk17/temurin-jammy/Dockerfile index f9585288d..d6b82ebe5 100644 --- a/10.1/jdk17/temurin-jammy/Dockerfile +++ b/10.1/jdk17/temurin-jammy/Dockerfile @@ -40,12 +40,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=$distFile" \ -# if the version is outdated (or we're grabbing the .asc file), we might have to pull from the dist/archive :/ - "https://downloads.apache.org/$distFile" \ - "https://www-us.apache.org/dist/$distFile" \ - "https://www.apache.org/dist/$distFile" \ +# https://apache.org/history/mirror-history.html + "https://dlcdn.apache.org/$distFile" \ +# if the version is outdated, we have to pull from the archive "https://archive.apache.org/dist/$distFile" \ # if all else fails, let's try Maven (https://www.mail-archive.com/users@tomcat.apache.org/msg134940.html; https://mvnrepository.com/artifact/org.apache.tomcat/tomcat; https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/) ${mvnFile:+"https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/$mvnFile"} \ diff --git a/10.1/jdk21/temurin-jammy/Dockerfile b/10.1/jdk21/temurin-jammy/Dockerfile index 16beff6f7..d2779df83 100644 --- a/10.1/jdk21/temurin-jammy/Dockerfile +++ b/10.1/jdk21/temurin-jammy/Dockerfile @@ -40,12 +40,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=$distFile" \ -# if the version is outdated (or we're grabbing the .asc file), we might have to pull from the dist/archive :/ - "https://downloads.apache.org/$distFile" \ - "https://www-us.apache.org/dist/$distFile" \ - "https://www.apache.org/dist/$distFile" \ +# https://apache.org/history/mirror-history.html + "https://dlcdn.apache.org/$distFile" \ +# if the version is outdated, we have to pull from the archive "https://archive.apache.org/dist/$distFile" \ # if all else fails, let's try Maven (https://www.mail-archive.com/users@tomcat.apache.org/msg134940.html; https://mvnrepository.com/artifact/org.apache.tomcat/tomcat; https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/) ${mvnFile:+"https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/$mvnFile"} \ diff --git a/11.0/jdk21/temurin-jammy/Dockerfile b/11.0/jdk21/temurin-jammy/Dockerfile index 8eb2a151d..bf4e50bee 100644 --- a/11.0/jdk21/temurin-jammy/Dockerfile +++ b/11.0/jdk21/temurin-jammy/Dockerfile @@ -40,12 +40,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=$distFile" \ -# if the version is outdated (or we're grabbing the .asc file), we might have to pull from the dist/archive :/ - "https://downloads.apache.org/$distFile" \ - "https://www-us.apache.org/dist/$distFile" \ - "https://www.apache.org/dist/$distFile" \ +# https://apache.org/history/mirror-history.html + "https://dlcdn.apache.org/$distFile" \ +# if the version is outdated, we have to pull from the archive "https://archive.apache.org/dist/$distFile" \ # if all else fails, let's try Maven (https://www.mail-archive.com/users@tomcat.apache.org/msg134940.html; https://mvnrepository.com/artifact/org.apache.tomcat/tomcat; https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/) ${mvnFile:+"https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/$mvnFile"} \ diff --git a/8.5/jdk11/corretto-al2/Dockerfile b/8.5/jdk11/corretto-al2/Dockerfile index 05319b977..c8188275b 100644 --- a/8.5/jdk11/corretto-al2/Dockerfile +++ b/8.5/jdk11/corretto-al2/Dockerfile @@ -53,12 +53,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=$distFile" \ -# if the version is outdated (or we're grabbing the .asc file), we might have to pull from the dist/archive :/ - "https://downloads.apache.org/$distFile" \ - "https://www-us.apache.org/dist/$distFile" \ - "https://www.apache.org/dist/$distFile" \ +# https://apache.org/history/mirror-history.html + "https://dlcdn.apache.org/$distFile" \ +# if the version is outdated, we have to pull from the archive "https://archive.apache.org/dist/$distFile" \ # if all else fails, let's try Maven (https://www.mail-archive.com/users@tomcat.apache.org/msg134940.html; https://mvnrepository.com/artifact/org.apache.tomcat/tomcat; https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/) ${mvnFile:+"https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/$mvnFile"} \ diff --git a/8.5/jdk11/temurin-focal/Dockerfile b/8.5/jdk11/temurin-focal/Dockerfile index fd7af14de..047c2b427 100644 --- a/8.5/jdk11/temurin-focal/Dockerfile +++ b/8.5/jdk11/temurin-focal/Dockerfile @@ -40,12 +40,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=$distFile" \ -# if the version is outdated (or we're grabbing the .asc file), we might have to pull from the dist/archive :/ - "https://downloads.apache.org/$distFile" \ - "https://www-us.apache.org/dist/$distFile" \ - "https://www.apache.org/dist/$distFile" \ +# https://apache.org/history/mirror-history.html + "https://dlcdn.apache.org/$distFile" \ +# if the version is outdated, we have to pull from the archive "https://archive.apache.org/dist/$distFile" \ # if all else fails, let's try Maven (https://www.mail-archive.com/users@tomcat.apache.org/msg134940.html; https://mvnrepository.com/artifact/org.apache.tomcat/tomcat; https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/) ${mvnFile:+"https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/$mvnFile"} \ diff --git a/8.5/jdk11/temurin-jammy/Dockerfile b/8.5/jdk11/temurin-jammy/Dockerfile index d575862e4..f15567bd3 100644 --- a/8.5/jdk11/temurin-jammy/Dockerfile +++ b/8.5/jdk11/temurin-jammy/Dockerfile @@ -40,12 +40,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=$distFile" \ -# if the version is outdated (or we're grabbing the .asc file), we might have to pull from the dist/archive :/ - "https://downloads.apache.org/$distFile" \ - "https://www-us.apache.org/dist/$distFile" \ - "https://www.apache.org/dist/$distFile" \ +# https://apache.org/history/mirror-history.html + "https://dlcdn.apache.org/$distFile" \ +# if the version is outdated, we have to pull from the archive "https://archive.apache.org/dist/$distFile" \ # if all else fails, let's try Maven (https://www.mail-archive.com/users@tomcat.apache.org/msg134940.html; https://mvnrepository.com/artifact/org.apache.tomcat/tomcat; https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/) ${mvnFile:+"https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/$mvnFile"} \ diff --git a/8.5/jdk17/corretto-al2/Dockerfile b/8.5/jdk17/corretto-al2/Dockerfile index 0bba14033..0a15a5395 100644 --- a/8.5/jdk17/corretto-al2/Dockerfile +++ b/8.5/jdk17/corretto-al2/Dockerfile @@ -53,12 +53,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=$distFile" \ -# if the version is outdated (or we're grabbing the .asc file), we might have to pull from the dist/archive :/ - "https://downloads.apache.org/$distFile" \ - "https://www-us.apache.org/dist/$distFile" \ - "https://www.apache.org/dist/$distFile" \ +# https://apache.org/history/mirror-history.html + "https://dlcdn.apache.org/$distFile" \ +# if the version is outdated, we have to pull from the archive "https://archive.apache.org/dist/$distFile" \ # if all else fails, let's try Maven (https://www.mail-archive.com/users@tomcat.apache.org/msg134940.html; https://mvnrepository.com/artifact/org.apache.tomcat/tomcat; https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/) ${mvnFile:+"https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/$mvnFile"} \ diff --git a/8.5/jdk17/temurin-focal/Dockerfile b/8.5/jdk17/temurin-focal/Dockerfile index b84d2dcee..128df3b6a 100644 --- a/8.5/jdk17/temurin-focal/Dockerfile +++ b/8.5/jdk17/temurin-focal/Dockerfile @@ -40,12 +40,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=$distFile" \ -# if the version is outdated (or we're grabbing the .asc file), we might have to pull from the dist/archive :/ - "https://downloads.apache.org/$distFile" \ - "https://www-us.apache.org/dist/$distFile" \ - "https://www.apache.org/dist/$distFile" \ +# https://apache.org/history/mirror-history.html + "https://dlcdn.apache.org/$distFile" \ +# if the version is outdated, we have to pull from the archive "https://archive.apache.org/dist/$distFile" \ # if all else fails, let's try Maven (https://www.mail-archive.com/users@tomcat.apache.org/msg134940.html; https://mvnrepository.com/artifact/org.apache.tomcat/tomcat; https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/) ${mvnFile:+"https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/$mvnFile"} \ diff --git a/8.5/jdk17/temurin-jammy/Dockerfile b/8.5/jdk17/temurin-jammy/Dockerfile index 69c8a33d6..5825d7401 100644 --- a/8.5/jdk17/temurin-jammy/Dockerfile +++ b/8.5/jdk17/temurin-jammy/Dockerfile @@ -40,12 +40,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=$distFile" \ -# if the version is outdated (or we're grabbing the .asc file), we might have to pull from the dist/archive :/ - "https://downloads.apache.org/$distFile" \ - "https://www-us.apache.org/dist/$distFile" \ - "https://www.apache.org/dist/$distFile" \ +# https://apache.org/history/mirror-history.html + "https://dlcdn.apache.org/$distFile" \ +# if the version is outdated, we have to pull from the archive "https://archive.apache.org/dist/$distFile" \ # if all else fails, let's try Maven (https://www.mail-archive.com/users@tomcat.apache.org/msg134940.html; https://mvnrepository.com/artifact/org.apache.tomcat/tomcat; https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/) ${mvnFile:+"https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/$mvnFile"} \ diff --git a/8.5/jdk21/corretto-al2/Dockerfile b/8.5/jdk21/corretto-al2/Dockerfile index d7969f675..d609a4800 100644 --- a/8.5/jdk21/corretto-al2/Dockerfile +++ b/8.5/jdk21/corretto-al2/Dockerfile @@ -53,12 +53,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=$distFile" \ -# if the version is outdated (or we're grabbing the .asc file), we might have to pull from the dist/archive :/ - "https://downloads.apache.org/$distFile" \ - "https://www-us.apache.org/dist/$distFile" \ - "https://www.apache.org/dist/$distFile" \ +# https://apache.org/history/mirror-history.html + "https://dlcdn.apache.org/$distFile" \ +# if the version is outdated, we have to pull from the archive "https://archive.apache.org/dist/$distFile" \ # if all else fails, let's try Maven (https://www.mail-archive.com/users@tomcat.apache.org/msg134940.html; https://mvnrepository.com/artifact/org.apache.tomcat/tomcat; https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/) ${mvnFile:+"https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/$mvnFile"} \ diff --git a/8.5/jdk21/temurin-jammy/Dockerfile b/8.5/jdk21/temurin-jammy/Dockerfile index ab3812ab6..f13351de4 100644 --- a/8.5/jdk21/temurin-jammy/Dockerfile +++ b/8.5/jdk21/temurin-jammy/Dockerfile @@ -40,12 +40,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=$distFile" \ -# if the version is outdated (or we're grabbing the .asc file), we might have to pull from the dist/archive :/ - "https://downloads.apache.org/$distFile" \ - "https://www-us.apache.org/dist/$distFile" \ - "https://www.apache.org/dist/$distFile" \ +# https://apache.org/history/mirror-history.html + "https://dlcdn.apache.org/$distFile" \ +# if the version is outdated, we have to pull from the archive "https://archive.apache.org/dist/$distFile" \ # if all else fails, let's try Maven (https://www.mail-archive.com/users@tomcat.apache.org/msg134940.html; https://mvnrepository.com/artifact/org.apache.tomcat/tomcat; https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/) ${mvnFile:+"https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/$mvnFile"} \ diff --git a/8.5/jdk8/corretto-al2/Dockerfile b/8.5/jdk8/corretto-al2/Dockerfile index 1813fa6f4..7bfe31e9f 100644 --- a/8.5/jdk8/corretto-al2/Dockerfile +++ b/8.5/jdk8/corretto-al2/Dockerfile @@ -53,12 +53,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=$distFile" \ -# if the version is outdated (or we're grabbing the .asc file), we might have to pull from the dist/archive :/ - "https://downloads.apache.org/$distFile" \ - "https://www-us.apache.org/dist/$distFile" \ - "https://www.apache.org/dist/$distFile" \ +# https://apache.org/history/mirror-history.html + "https://dlcdn.apache.org/$distFile" \ +# if the version is outdated, we have to pull from the archive "https://archive.apache.org/dist/$distFile" \ # if all else fails, let's try Maven (https://www.mail-archive.com/users@tomcat.apache.org/msg134940.html; https://mvnrepository.com/artifact/org.apache.tomcat/tomcat; https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/) ${mvnFile:+"https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/$mvnFile"} \ diff --git a/8.5/jdk8/temurin-focal/Dockerfile b/8.5/jdk8/temurin-focal/Dockerfile index a92268f77..a044be106 100644 --- a/8.5/jdk8/temurin-focal/Dockerfile +++ b/8.5/jdk8/temurin-focal/Dockerfile @@ -40,12 +40,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=$distFile" \ -# if the version is outdated (or we're grabbing the .asc file), we might have to pull from the dist/archive :/ - "https://downloads.apache.org/$distFile" \ - "https://www-us.apache.org/dist/$distFile" \ - "https://www.apache.org/dist/$distFile" \ +# https://apache.org/history/mirror-history.html + "https://dlcdn.apache.org/$distFile" \ +# if the version is outdated, we have to pull from the archive "https://archive.apache.org/dist/$distFile" \ # if all else fails, let's try Maven (https://www.mail-archive.com/users@tomcat.apache.org/msg134940.html; https://mvnrepository.com/artifact/org.apache.tomcat/tomcat; https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/) ${mvnFile:+"https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/$mvnFile"} \ diff --git a/8.5/jdk8/temurin-jammy/Dockerfile b/8.5/jdk8/temurin-jammy/Dockerfile index 5a501834f..08856e74d 100644 --- a/8.5/jdk8/temurin-jammy/Dockerfile +++ b/8.5/jdk8/temurin-jammy/Dockerfile @@ -40,12 +40,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=$distFile" \ -# if the version is outdated (or we're grabbing the .asc file), we might have to pull from the dist/archive :/ - "https://downloads.apache.org/$distFile" \ - "https://www-us.apache.org/dist/$distFile" \ - "https://www.apache.org/dist/$distFile" \ +# https://apache.org/history/mirror-history.html + "https://dlcdn.apache.org/$distFile" \ +# if the version is outdated, we have to pull from the archive "https://archive.apache.org/dist/$distFile" \ # if all else fails, let's try Maven (https://www.mail-archive.com/users@tomcat.apache.org/msg134940.html; https://mvnrepository.com/artifact/org.apache.tomcat/tomcat; https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/) ${mvnFile:+"https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/$mvnFile"} \ diff --git a/9.0/jdk11/corretto-al2/Dockerfile b/9.0/jdk11/corretto-al2/Dockerfile index 854d49f28..eed9826d9 100644 --- a/9.0/jdk11/corretto-al2/Dockerfile +++ b/9.0/jdk11/corretto-al2/Dockerfile @@ -53,12 +53,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=$distFile" \ -# if the version is outdated (or we're grabbing the .asc file), we might have to pull from the dist/archive :/ - "https://downloads.apache.org/$distFile" \ - "https://www-us.apache.org/dist/$distFile" \ - "https://www.apache.org/dist/$distFile" \ +# https://apache.org/history/mirror-history.html + "https://dlcdn.apache.org/$distFile" \ +# if the version is outdated, we have to pull from the archive "https://archive.apache.org/dist/$distFile" \ # if all else fails, let's try Maven (https://www.mail-archive.com/users@tomcat.apache.org/msg134940.html; https://mvnrepository.com/artifact/org.apache.tomcat/tomcat; https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/) ${mvnFile:+"https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/$mvnFile"} \ diff --git a/9.0/jdk11/temurin-focal/Dockerfile b/9.0/jdk11/temurin-focal/Dockerfile index 3781ba79f..60e1e5540 100644 --- a/9.0/jdk11/temurin-focal/Dockerfile +++ b/9.0/jdk11/temurin-focal/Dockerfile @@ -40,12 +40,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=$distFile" \ -# if the version is outdated (or we're grabbing the .asc file), we might have to pull from the dist/archive :/ - "https://downloads.apache.org/$distFile" \ - "https://www-us.apache.org/dist/$distFile" \ - "https://www.apache.org/dist/$distFile" \ +# https://apache.org/history/mirror-history.html + "https://dlcdn.apache.org/$distFile" \ +# if the version is outdated, we have to pull from the archive "https://archive.apache.org/dist/$distFile" \ # if all else fails, let's try Maven (https://www.mail-archive.com/users@tomcat.apache.org/msg134940.html; https://mvnrepository.com/artifact/org.apache.tomcat/tomcat; https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/) ${mvnFile:+"https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/$mvnFile"} \ diff --git a/9.0/jdk11/temurin-jammy/Dockerfile b/9.0/jdk11/temurin-jammy/Dockerfile index cc0a02dda..66c8cb2c8 100644 --- a/9.0/jdk11/temurin-jammy/Dockerfile +++ b/9.0/jdk11/temurin-jammy/Dockerfile @@ -40,12 +40,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=$distFile" \ -# if the version is outdated (or we're grabbing the .asc file), we might have to pull from the dist/archive :/ - "https://downloads.apache.org/$distFile" \ - "https://www-us.apache.org/dist/$distFile" \ - "https://www.apache.org/dist/$distFile" \ +# https://apache.org/history/mirror-history.html + "https://dlcdn.apache.org/$distFile" \ +# if the version is outdated, we have to pull from the archive "https://archive.apache.org/dist/$distFile" \ # if all else fails, let's try Maven (https://www.mail-archive.com/users@tomcat.apache.org/msg134940.html; https://mvnrepository.com/artifact/org.apache.tomcat/tomcat; https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/) ${mvnFile:+"https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/$mvnFile"} \ diff --git a/9.0/jdk17/corretto-al2/Dockerfile b/9.0/jdk17/corretto-al2/Dockerfile index 2fb41b5c3..f3a4ac734 100644 --- a/9.0/jdk17/corretto-al2/Dockerfile +++ b/9.0/jdk17/corretto-al2/Dockerfile @@ -53,12 +53,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=$distFile" \ -# if the version is outdated (or we're grabbing the .asc file), we might have to pull from the dist/archive :/ - "https://downloads.apache.org/$distFile" \ - "https://www-us.apache.org/dist/$distFile" \ - "https://www.apache.org/dist/$distFile" \ +# https://apache.org/history/mirror-history.html + "https://dlcdn.apache.org/$distFile" \ +# if the version is outdated, we have to pull from the archive "https://archive.apache.org/dist/$distFile" \ # if all else fails, let's try Maven (https://www.mail-archive.com/users@tomcat.apache.org/msg134940.html; https://mvnrepository.com/artifact/org.apache.tomcat/tomcat; https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/) ${mvnFile:+"https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/$mvnFile"} \ diff --git a/9.0/jdk17/temurin-focal/Dockerfile b/9.0/jdk17/temurin-focal/Dockerfile index 6971b1e37..388996ba7 100644 --- a/9.0/jdk17/temurin-focal/Dockerfile +++ b/9.0/jdk17/temurin-focal/Dockerfile @@ -40,12 +40,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=$distFile" \ -# if the version is outdated (or we're grabbing the .asc file), we might have to pull from the dist/archive :/ - "https://downloads.apache.org/$distFile" \ - "https://www-us.apache.org/dist/$distFile" \ - "https://www.apache.org/dist/$distFile" \ +# https://apache.org/history/mirror-history.html + "https://dlcdn.apache.org/$distFile" \ +# if the version is outdated, we have to pull from the archive "https://archive.apache.org/dist/$distFile" \ # if all else fails, let's try Maven (https://www.mail-archive.com/users@tomcat.apache.org/msg134940.html; https://mvnrepository.com/artifact/org.apache.tomcat/tomcat; https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/) ${mvnFile:+"https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/$mvnFile"} \ diff --git a/9.0/jdk17/temurin-jammy/Dockerfile b/9.0/jdk17/temurin-jammy/Dockerfile index 177a347be..a387be0a7 100644 --- a/9.0/jdk17/temurin-jammy/Dockerfile +++ b/9.0/jdk17/temurin-jammy/Dockerfile @@ -40,12 +40,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=$distFile" \ -# if the version is outdated (or we're grabbing the .asc file), we might have to pull from the dist/archive :/ - "https://downloads.apache.org/$distFile" \ - "https://www-us.apache.org/dist/$distFile" \ - "https://www.apache.org/dist/$distFile" \ +# https://apache.org/history/mirror-history.html + "https://dlcdn.apache.org/$distFile" \ +# if the version is outdated, we have to pull from the archive "https://archive.apache.org/dist/$distFile" \ # if all else fails, let's try Maven (https://www.mail-archive.com/users@tomcat.apache.org/msg134940.html; https://mvnrepository.com/artifact/org.apache.tomcat/tomcat; https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/) ${mvnFile:+"https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/$mvnFile"} \ diff --git a/9.0/jdk21/corretto-al2/Dockerfile b/9.0/jdk21/corretto-al2/Dockerfile index fb1425a35..2062ddffe 100644 --- a/9.0/jdk21/corretto-al2/Dockerfile +++ b/9.0/jdk21/corretto-al2/Dockerfile @@ -53,12 +53,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=$distFile" \ -# if the version is outdated (or we're grabbing the .asc file), we might have to pull from the dist/archive :/ - "https://downloads.apache.org/$distFile" \ - "https://www-us.apache.org/dist/$distFile" \ - "https://www.apache.org/dist/$distFile" \ +# https://apache.org/history/mirror-history.html + "https://dlcdn.apache.org/$distFile" \ +# if the version is outdated, we have to pull from the archive "https://archive.apache.org/dist/$distFile" \ # if all else fails, let's try Maven (https://www.mail-archive.com/users@tomcat.apache.org/msg134940.html; https://mvnrepository.com/artifact/org.apache.tomcat/tomcat; https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/) ${mvnFile:+"https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/$mvnFile"} \ diff --git a/9.0/jdk21/temurin-jammy/Dockerfile b/9.0/jdk21/temurin-jammy/Dockerfile index f6a64be60..bffe2e97e 100644 --- a/9.0/jdk21/temurin-jammy/Dockerfile +++ b/9.0/jdk21/temurin-jammy/Dockerfile @@ -40,12 +40,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=$distFile" \ -# if the version is outdated (or we're grabbing the .asc file), we might have to pull from the dist/archive :/ - "https://downloads.apache.org/$distFile" \ - "https://www-us.apache.org/dist/$distFile" \ - "https://www.apache.org/dist/$distFile" \ +# https://apache.org/history/mirror-history.html + "https://dlcdn.apache.org/$distFile" \ +# if the version is outdated, we have to pull from the archive "https://archive.apache.org/dist/$distFile" \ # if all else fails, let's try Maven (https://www.mail-archive.com/users@tomcat.apache.org/msg134940.html; https://mvnrepository.com/artifact/org.apache.tomcat/tomcat; https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/) ${mvnFile:+"https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/$mvnFile"} \ diff --git a/9.0/jdk8/corretto-al2/Dockerfile b/9.0/jdk8/corretto-al2/Dockerfile index 4a69a59b3..d922f2feb 100644 --- a/9.0/jdk8/corretto-al2/Dockerfile +++ b/9.0/jdk8/corretto-al2/Dockerfile @@ -53,12 +53,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=$distFile" \ -# if the version is outdated (or we're grabbing the .asc file), we might have to pull from the dist/archive :/ - "https://downloads.apache.org/$distFile" \ - "https://www-us.apache.org/dist/$distFile" \ - "https://www.apache.org/dist/$distFile" \ +# https://apache.org/history/mirror-history.html + "https://dlcdn.apache.org/$distFile" \ +# if the version is outdated, we have to pull from the archive "https://archive.apache.org/dist/$distFile" \ # if all else fails, let's try Maven (https://www.mail-archive.com/users@tomcat.apache.org/msg134940.html; https://mvnrepository.com/artifact/org.apache.tomcat/tomcat; https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/) ${mvnFile:+"https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/$mvnFile"} \ diff --git a/9.0/jdk8/temurin-focal/Dockerfile b/9.0/jdk8/temurin-focal/Dockerfile index 5b4b44c35..f790533ae 100644 --- a/9.0/jdk8/temurin-focal/Dockerfile +++ b/9.0/jdk8/temurin-focal/Dockerfile @@ -40,12 +40,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=$distFile" \ -# if the version is outdated (or we're grabbing the .asc file), we might have to pull from the dist/archive :/ - "https://downloads.apache.org/$distFile" \ - "https://www-us.apache.org/dist/$distFile" \ - "https://www.apache.org/dist/$distFile" \ +# https://apache.org/history/mirror-history.html + "https://dlcdn.apache.org/$distFile" \ +# if the version is outdated, we have to pull from the archive "https://archive.apache.org/dist/$distFile" \ # if all else fails, let's try Maven (https://www.mail-archive.com/users@tomcat.apache.org/msg134940.html; https://mvnrepository.com/artifact/org.apache.tomcat/tomcat; https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/) ${mvnFile:+"https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/$mvnFile"} \ diff --git a/9.0/jdk8/temurin-jammy/Dockerfile b/9.0/jdk8/temurin-jammy/Dockerfile index 5780871b3..feed6fe5d 100644 --- a/9.0/jdk8/temurin-jammy/Dockerfile +++ b/9.0/jdk8/temurin-jammy/Dockerfile @@ -40,12 +40,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=$distFile" \ -# if the version is outdated (or we're grabbing the .asc file), we might have to pull from the dist/archive :/ - "https://downloads.apache.org/$distFile" \ - "https://www-us.apache.org/dist/$distFile" \ - "https://www.apache.org/dist/$distFile" \ +# https://apache.org/history/mirror-history.html + "https://dlcdn.apache.org/$distFile" \ +# if the version is outdated, we have to pull from the archive "https://archive.apache.org/dist/$distFile" \ # if all else fails, let's try Maven (https://www.mail-archive.com/users@tomcat.apache.org/msg134940.html; https://mvnrepository.com/artifact/org.apache.tomcat/tomcat; https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/) ${mvnFile:+"https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/$mvnFile"} \ diff --git a/Dockerfile.template b/Dockerfile.template index d553a0f2e..ab2536b5e 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -123,12 +123,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=$distFile" \ -# if the version is outdated (or we're grabbing the .asc file), we might have to pull from the dist/archive :/ - "https://downloads.apache.org/$distFile" \ - "https://www-us.apache.org/dist/$distFile" \ - "https://www.apache.org/dist/$distFile" \ +# https://apache.org/history/mirror-history.html + "https://dlcdn.apache.org/$distFile" \ +# if the version is outdated, we have to pull from the archive "https://archive.apache.org/dist/$distFile" \ # if all else fails, let's try Maven (https://www.mail-archive.com/users@tomcat.apache.org/msg134940.html; https://mvnrepository.com/artifact/org.apache.tomcat/tomcat; https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/) ${mvnFile:+"https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/$mvnFile"} \