From 2f796bb9c81fcfbc8585832b99a5f780ae2b2f52 Mon Sep 17 00:00:00 2001 From: Joseph Lawson Date: Wed, 15 Mar 2023 19:22:56 -0400 Subject: [PATCH] use archive.apache.org for maven downloads (#609) * use archive.apache.org for maven downloads * fix linting --- al2/aarch64/standard/1.0/Dockerfile | 13 +++++++++---- al2/aarch64/standard/2.0/Dockerfile | 2 +- al2/x86_64/standard/3.0/Dockerfile | 2 +- al2/x86_64/standard/4.0/Dockerfile | 4 ++-- ubuntu/standard/4.0/Dockerfile | 2 +- ubuntu/standard/5.0/Dockerfile | 2 +- ubuntu/standard/6.0/Dockerfile | 2 +- 7 files changed, 16 insertions(+), 11 deletions(-) diff --git a/al2/aarch64/standard/1.0/Dockerfile b/al2/aarch64/standard/1.0/Dockerfile index fbe7fe78..96d0430d 100644 --- a/al2/aarch64/standard/1.0/Dockerfile +++ b/al2/aarch64/standard/1.0/Dockerfile @@ -15,7 +15,7 @@ ENV RUBY_VERSION="2.6.5" \ PYTHON_37_VERSION="3.7.4" \ PYTHON_VERSION="3.8.0" \ PHP_VERSION=7.3.10 \ - JAVA_VERSION=11 \ + JAVA_VERSION=11 \ NODE_VERSION="12.13.0" \ NODE_10_VERSION="10.16.3" \ NODE_8_VERSION="8.16.0" \ @@ -27,7 +27,7 @@ ENV RUBY_VERSION="2.6.5" \ ARG CHINA_REGION #**************** Utilities ********************************************* -ENV DOCKER_BUCKET="download.docker.com" \ +ENV DOCKER_BUCKET="download.docker.com" \ DOCKER_CHANNEL="stable" \ DOCKER_SHA256="0259f8b6572f02cf0dafd7388ca0e4adfdbbfaba81cfb1b7443e89fccbed22c7" \ DIND_COMMIT="3b5fac462d21ca164b3778647420016315289034" \ @@ -301,20 +301,24 @@ RUN cd /usr/local/python38/bin \ update-alternatives --set $tool $tool_path; \ done \ && rm -fr /tmp/* /var/tmp/* + #**************** END PYTHON ********************************************* #**************** PHP **************************************************** ENV GPG_KEYS CBAF69F173A0FEA4B537F470D66C9593118BCCB6 F38252826ACD957EF380D39F2F7956BC5DA04B5D + ENV PHP_DOWNLOAD_SHA="42f00a15419e05771734b7159c8d39d639b8a5a6770413adfa2615f6f923d906" \ PHPPATH="/php" \ PHP_INI_DIR="/usr/local/etc/php" \ PHP_CFLAGS="-fstack-protector -fpic -fpie -O2" \ PHP_LDFLAGS="-Wl,-O1 -Wl,--hash-style=both -pie" + ENV PHP_SRC_DIR="$SRC_DIR/php" \ PHP_CPPFLAGS="$PHP_CFLAGS" \ PHP_URL="https://secure.php.net/get/php-$PHP_VERSION.tar.xz/from/this/mirror" \ PHP_ASC_URL="https://secure.php.net/get/php-$PHP_VERSION.tar.xz.asc/from/this/mirror" - RUN set -xe; \ + +RUN set -xe; \ mkdir -p $SRC_DIR; \ cd $SRC_DIR; \ yum install -yq curl-devel; \ @@ -389,6 +393,7 @@ RUN cd /usr/local/python38/bin \ # Install Composer globally RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer + #**************** END PHP **************************************************** #**************** NODEJS **************************************************** @@ -462,7 +467,7 @@ RUN set -ex \ && update-alternatives --install /usr/bin/ant ant /opt/apache-ant-$ANT_VERSION/bin/ant 10000 \ # Install Maven && mkdir -p $MAVEN_HOME \ - && curl -LSso /var/tmp/apache-maven-$MAVEN_VERSION-bin.tar.gz https://apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz \ + && curl -LSso /var/tmp/apache-maven-$MAVEN_VERSION-bin.tar.gz https://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz \ && echo "$MAVEN_DOWNLOAD_SHA512 /var/tmp/apache-maven-$MAVEN_VERSION-bin.tar.gz" | sha512sum -c - \ && tar xzf /var/tmp/apache-maven-$MAVEN_VERSION-bin.tar.gz -C $MAVEN_HOME --strip-components=1 \ && update-alternatives --install /usr/bin/mvn mvn /opt/maven/bin/mvn 10000 \ diff --git a/al2/aarch64/standard/2.0/Dockerfile b/al2/aarch64/standard/2.0/Dockerfile index 7b344a5c..e95d2c53 100644 --- a/al2/aarch64/standard/2.0/Dockerfile +++ b/al2/aarch64/standard/2.0/Dockerfile @@ -174,7 +174,7 @@ RUN set -x \ RUN set -ex \ # Install Maven && mkdir -p $MAVEN_HOME \ - && curl -LSso /var/tmp/apache-maven-$MAVEN_VERSION-bin.tar.gz https://apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz \ + && curl -LSso /var/tmp/apache-maven-$MAVEN_VERSION-bin.tar.gz https://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz \ && echo "$MAVEN_DOWNLOAD_SHA512 /var/tmp/apache-maven-$MAVEN_VERSION-bin.tar.gz" | sha512sum -c - \ && tar xzvf /var/tmp/apache-maven-$MAVEN_VERSION-bin.tar.gz -C $MAVEN_HOME --strip-components=1 \ && rm /var/tmp/apache-maven-$MAVEN_VERSION-bin.tar.gz \ diff --git a/al2/x86_64/standard/3.0/Dockerfile b/al2/x86_64/standard/3.0/Dockerfile index 618675b5..e974e69d 100644 --- a/al2/x86_64/standard/3.0/Dockerfile +++ b/al2/x86_64/standard/3.0/Dockerfile @@ -242,7 +242,7 @@ RUN set -x \ RUN set -ex \ # Install Maven && mkdir -p $MAVEN_HOME \ - && curl -LSso /var/tmp/apache-maven-$MAVEN_VERSION-bin.tar.gz https://apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz \ + && curl -LSso /var/tmp/apache-maven-$MAVEN_VERSION-bin.tar.gz https://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz \ && echo "$MAVEN_DOWNLOAD_SHA512 /var/tmp/apache-maven-$MAVEN_VERSION-bin.tar.gz" | sha512sum -c - \ && tar xzf /var/tmp/apache-maven-$MAVEN_VERSION-bin.tar.gz -C $MAVEN_HOME --strip-components=1 \ && rm /var/tmp/apache-maven-$MAVEN_VERSION-bin.tar.gz \ diff --git a/al2/x86_64/standard/4.0/Dockerfile b/al2/x86_64/standard/4.0/Dockerfile index e48d568b..9adb55d6 100644 --- a/al2/x86_64/standard/4.0/Dockerfile +++ b/al2/x86_64/standard/4.0/Dockerfile @@ -175,7 +175,7 @@ RUN set -x \ RUN set -ex \ # Install Maven && mkdir -p $MAVEN_HOME \ - && curl -LSso /var/tmp/apache-maven-$MAVEN_VERSION-bin.tar.gz https://apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz \ + && curl -LSso /var/tmp/apache-maven-$MAVEN_VERSION-bin.tar.gz https://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz \ && echo "$MAVEN_DOWNLOAD_SHA512 /var/tmp/apache-maven-$MAVEN_VERSION-bin.tar.gz" | sha512sum -c - \ && tar xzf /var/tmp/apache-maven-$MAVEN_VERSION-bin.tar.gz -C $MAVEN_HOME --strip-components=1 \ && rm /var/tmp/apache-maven-$MAVEN_VERSION-bin.tar.gz \ @@ -305,7 +305,7 @@ ENV GOLANG_18_VERSION="1.18.9" ENV GOENV_DISABLE_GOPATH=1 ENV GOPATH="/go" -RUN goenv install $GOLANG_18_VERSION && rm -rf /tmp/* && \ +RUN goenv install $GOLANG_18_VERSION && rm -rf /tmp/* && \ goenv global $GOLANG_18_VERSION && \ go env -w GO111MODULE=auto diff --git a/ubuntu/standard/4.0/Dockerfile b/ubuntu/standard/4.0/Dockerfile index e83123d6..55a81130 100644 --- a/ubuntu/standard/4.0/Dockerfile +++ b/ubuntu/standard/4.0/Dockerfile @@ -396,7 +396,7 @@ RUN set -ex \ RUN set -ex \ # Install Maven && mkdir -p $MAVEN_HOME \ - && curl -LSso /var/tmp/apache-maven-$MAVEN_VERSION-bin.tar.gz https://apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz \ + && curl -LSso /var/tmp/apache-maven-$MAVEN_VERSION-bin.tar.gz https://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz \ && echo "$MAVEN_DOWNLOAD_SHA512 /var/tmp/apache-maven-$MAVEN_VERSION-bin.tar.gz" | sha512sum -c - \ && tar xzf /var/tmp/apache-maven-$MAVEN_VERSION-bin.tar.gz -C $MAVEN_HOME --strip-components=1 \ && rm /var/tmp/apache-maven-$MAVEN_VERSION-bin.tar.gz \ diff --git a/ubuntu/standard/5.0/Dockerfile b/ubuntu/standard/5.0/Dockerfile index f9eece97..e9536837 100644 --- a/ubuntu/standard/5.0/Dockerfile +++ b/ubuntu/standard/5.0/Dockerfile @@ -377,7 +377,7 @@ RUN set -ex \ RUN set -ex \ # Install Maven && mkdir -p $MAVEN_HOME \ - && curl -LSso /var/tmp/apache-maven-$MAVEN_VERSION-bin.tar.gz https://apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz \ + && curl -LSso /var/tmp/apache-maven-$MAVEN_VERSION-bin.tar.gz https://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz \ && echo "$MAVEN_DOWNLOAD_SHA512 /var/tmp/apache-maven-$MAVEN_VERSION-bin.tar.gz" | sha512sum -c - \ && tar xzf /var/tmp/apache-maven-$MAVEN_VERSION-bin.tar.gz -C $MAVEN_HOME --strip-components=1 \ && rm /var/tmp/apache-maven-$MAVEN_VERSION-bin.tar.gz \ diff --git a/ubuntu/standard/6.0/Dockerfile b/ubuntu/standard/6.0/Dockerfile index 00db5a8d..1bc2c8e5 100644 --- a/ubuntu/standard/6.0/Dockerfile +++ b/ubuntu/standard/6.0/Dockerfile @@ -294,7 +294,7 @@ RUN set -ex \ RUN set -ex \ # Install Maven && mkdir -p $MAVEN_HOME \ - && curl -LSso /var/tmp/apache-maven-$MAVEN_VERSION-bin.tar.gz https://apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz \ + && curl -LSso /var/tmp/apache-maven-$MAVEN_VERSION-bin.tar.gz https://archive.apache.org/dist/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz \ && echo "$MAVEN_DOWNLOAD_SHA512 /var/tmp/apache-maven-$MAVEN_VERSION-bin.tar.gz" | sha512sum -c - \ && tar xzf /var/tmp/apache-maven-$MAVEN_VERSION-bin.tar.gz -C $MAVEN_HOME --strip-components=1 \ && rm /var/tmp/apache-maven-$MAVEN_VERSION-bin.tar.gz \