Use Apache's "closer.cgi?action=download" functionality for automatic mirror selection
See https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394 for about the only place I can find this documented.
This commit is contained in:
parent
75fd77b355
commit
b13054c7de
|
|
@ -24,7 +24,11 @@ RUN apt-get update \
|
|||
|
||||
ENV HTTPD_VERSION 2.2.31
|
||||
ENV HTTPD_SHA1 e3b55387112206307ba76526820a2627472f3787
|
||||
ENV HTTPD_BZ2_URL https://www.apache.org/dist/httpd/httpd-$HTTPD_VERSION.tar.bz2
|
||||
|
||||
# https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
|
||||
ENV HTTPD_BZ2_URL https://www.apache.org/dyn/closer.cgi?action=download&filename=httpd/httpd-$HTTPD_VERSION.tar.bz2
|
||||
# not all the mirrors actually carry the .asc files :'(
|
||||
ENV HTTPD_ASC_URL https://www.apache.org/dist/httpd/httpd-$HTTPD_VERSION.tar.bz2.asc
|
||||
|
||||
RUN set -x \
|
||||
&& buildDeps=' \
|
||||
|
|
@ -43,7 +47,7 @@ RUN set -x \
|
|||
&& wget -O httpd.tar.bz2 "$HTTPD_BZ2_URL" \
|
||||
&& echo "$HTTPD_SHA1 *httpd.tar.bz2" | sha1sum -c - \
|
||||
# see https://httpd.apache.org/download.cgi#verify
|
||||
&& wget -O httpd.tar.bz2.asc "$HTTPD_BZ2_URL.asc" \
|
||||
&& wget -O httpd.tar.bz2.asc "$HTTPD_ASC_URL" \
|
||||
&& export GNUPGHOME="$(mktemp -d)" \
|
||||
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B1B96F45DFBDCCF974019235193F180AB55D9977 \
|
||||
&& gpg --batch --verify httpd.tar.bz2.asc httpd.tar.bz2 \
|
||||
|
|
|
|||
|
|
@ -17,9 +17,12 @@ WORKDIR $HTTPD_PREFIX
|
|||
|
||||
ENV HTTPD_VERSION 2.2.31
|
||||
ENV HTTPD_SHA1 e3b55387112206307ba76526820a2627472f3787
|
||||
ENV HTTPD_BZ2_URL https://www.apache.org/dist/httpd/httpd-$HTTPD_VERSION.tar.bz2
|
||||
|
||||
# see https://httpd.apache.org/docs/2.4/install.html#requirements
|
||||
# https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
|
||||
ENV HTTPD_BZ2_URL https://www.apache.org/dyn/closer.cgi?action=download&filename=httpd/httpd-$HTTPD_VERSION.tar.bz2
|
||||
# not all the mirrors actually carry the .asc files :'(
|
||||
ENV HTTPD_ASC_URL https://www.apache.org/dist/httpd/httpd-$HTTPD_VERSION.tar.bz2.asc
|
||||
|
||||
RUN set -x \
|
||||
&& runDeps=' \
|
||||
apr-dev \
|
||||
|
|
@ -41,7 +44,7 @@ RUN set -x \
|
|||
&& wget -O httpd.tar.bz2 "$HTTPD_BZ2_URL" \
|
||||
&& echo "$HTTPD_SHA1 *httpd.tar.bz2" | sha1sum -c - \
|
||||
# see https://httpd.apache.org/download.cgi#verify
|
||||
&& wget -O httpd.tar.bz2.asc "$HTTPD_BZ2_URL.asc" \
|
||||
&& wget -O httpd.tar.bz2.asc "$HTTPD_ASC_URL" \
|
||||
&& export GNUPGHOME="$(mktemp -d)" \
|
||||
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B1B96F45DFBDCCF974019235193F180AB55D9977 \
|
||||
&& gpg --batch --verify httpd.tar.bz2.asc httpd.tar.bz2 \
|
||||
|
|
|
|||
|
|
@ -24,8 +24,13 @@ RUN apt-get update \
|
|||
|
||||
ENV HTTPD_VERSION 2.4.23
|
||||
ENV HTTPD_SHA1 5101be34ac4a509b245adb70a56690a84fcc4e7f
|
||||
ENV HTTPD_BZ2_URL https://www.apache.org/dist/httpd/httpd-$HTTPD_VERSION.tar.bz2
|
||||
|
||||
# https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
|
||||
ENV HTTPD_BZ2_URL https://www.apache.org/dyn/closer.cgi?action=download&filename=httpd/httpd-$HTTPD_VERSION.tar.bz2
|
||||
# not all the mirrors actually carry the .asc files :'(
|
||||
ENV HTTPD_ASC_URL https://www.apache.org/dist/httpd/httpd-$HTTPD_VERSION.tar.bz2.asc
|
||||
|
||||
# see https://httpd.apache.org/docs/2.4/install.html#requirements
|
||||
RUN set -x \
|
||||
&& buildDeps=' \
|
||||
bzip2 \
|
||||
|
|
@ -43,7 +48,7 @@ RUN set -x \
|
|||
&& wget -O httpd.tar.bz2 "$HTTPD_BZ2_URL" \
|
||||
&& echo "$HTTPD_SHA1 *httpd.tar.bz2" | sha1sum -c - \
|
||||
# see https://httpd.apache.org/download.cgi#verify
|
||||
&& wget -O httpd.tar.bz2.asc "$HTTPD_BZ2_URL.asc" \
|
||||
&& wget -O httpd.tar.bz2.asc "$HTTPD_ASC_URL" \
|
||||
&& export GNUPGHOME="$(mktemp -d)" \
|
||||
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys A93D62ECC3C8EA12DB220EC934EA76E6791485A8 \
|
||||
&& gpg --batch --verify httpd.tar.bz2.asc httpd.tar.bz2 \
|
||||
|
|
|
|||
|
|
@ -17,7 +17,11 @@ WORKDIR $HTTPD_PREFIX
|
|||
|
||||
ENV HTTPD_VERSION 2.4.23
|
||||
ENV HTTPD_SHA1 5101be34ac4a509b245adb70a56690a84fcc4e7f
|
||||
ENV HTTPD_BZ2_URL https://www.apache.org/dist/httpd/httpd-$HTTPD_VERSION.tar.bz2
|
||||
|
||||
# https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
|
||||
ENV HTTPD_BZ2_URL https://www.apache.org/dyn/closer.cgi?action=download&filename=httpd/httpd-$HTTPD_VERSION.tar.bz2
|
||||
# not all the mirrors actually carry the .asc files :'(
|
||||
ENV HTTPD_ASC_URL https://www.apache.org/dist/httpd/httpd-$HTTPD_VERSION.tar.bz2.asc
|
||||
|
||||
# see https://httpd.apache.org/docs/2.4/install.html#requirements
|
||||
RUN set -x \
|
||||
|
|
@ -41,7 +45,7 @@ RUN set -x \
|
|||
&& wget -O httpd.tar.bz2 "$HTTPD_BZ2_URL" \
|
||||
&& echo "$HTTPD_SHA1 *httpd.tar.bz2" | sha1sum -c - \
|
||||
# see https://httpd.apache.org/download.cgi#verify
|
||||
&& wget -O httpd.tar.bz2.asc "$HTTPD_BZ2_URL.asc" \
|
||||
&& wget -O httpd.tar.bz2.asc "$HTTPD_ASC_URL" \
|
||||
&& export GNUPGHOME="$(mktemp -d)" \
|
||||
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys A93D62ECC3C8EA12DB220EC934EA76E6791485A8 \
|
||||
&& gpg --batch --verify httpd.tar.bz2.asc httpd.tar.bz2 \
|
||||
|
|
|
|||
Loading…
Reference in New Issue