From be1405819a93f642d218499ee9e7aa8dec4245f9 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 3 Jul 2019 14:05:55 -0700 Subject: [PATCH] Move APACHE_DIST_URLS directly into ddist function There's not really a good reason for this to be an explicit environment variable. --- 2.4/Dockerfile | 19 +++++++++---------- 2.4/alpine/Dockerfile | 17 ++++++++--------- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/2.4/Dockerfile b/2.4/Dockerfile index 739afc8..373740f 100644 --- a/2.4/Dockerfile +++ b/2.4/Dockerfile @@ -26,14 +26,6 @@ ENV HTTPD_SHA256 b4ca9d05773aa59b54d66cd8f4744b945289f084d3be17d7981d1783a5decfa # https://httpd.apache.org/security/vulnerabilities_24.html ENV HTTPD_PATCHES="" -ENV APACHE_DIST_URLS \ -# 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://archive.apache.org/dist/ - # see https://httpd.apache.org/docs/2.4/install.html#requirements RUN set -eux; \ \ @@ -69,7 +61,14 @@ RUN set -eux; \ local distFile="$1"; shift; \ local success=; \ local distUrl=; \ - for distUrl in $APACHE_DIST_URLS; do \ + 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://archive.apache.org/dist/ \ + ; do \ if wget -O "$f" "$distUrl$distFile" && [ -s "$f" ]; then \ success=1; \ break; \ @@ -87,7 +86,7 @@ RUN set -eux; \ for key in \ # gpg: key 791485A8: public key "Jim Jagielski (Release Signing Key) " imported A93D62ECC3C8EA12DB220EC934EA76E6791485A8 \ -# gpg: key 995E35221AD84DFF: public key "Daniel Ruggeri (http://home.apache.org/~druggeri/) " imported +# gpg: key 995E35221AD84DFF: public key "Daniel Ruggeri (https://home.apache.org/~druggeri/) " imported B9E8213AEFB861AF35A41F2C995E35221AD84DFF \ ; do \ gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ diff --git a/2.4/alpine/Dockerfile b/2.4/alpine/Dockerfile index 5e50e36..760ba31 100644 --- a/2.4/alpine/Dockerfile +++ b/2.4/alpine/Dockerfile @@ -21,14 +21,6 @@ ENV HTTPD_SHA256 b4ca9d05773aa59b54d66cd8f4744b945289f084d3be17d7981d1783a5decfa # https://httpd.apache.org/security/vulnerabilities_24.html ENV HTTPD_PATCHES="" -ENV APACHE_DIST_URLS \ -# 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://archive.apache.org/dist/ - # see https://httpd.apache.org/docs/2.4/install.html#requirements RUN set -eux; \ \ @@ -70,7 +62,14 @@ RUN set -eux; \ local distFile="$1"; shift; \ local success=; \ local distUrl=; \ - for distUrl in $APACHE_DIST_URLS; do \ + 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://archive.apache.org/dist/ \ + ; do \ if wget -O "$f" "$distUrl$distFile" && [ -s "$f" ]; then \ success=1; \ break; \