From ebea8ae98867020368797d045252ca26cc4783d6 Mon Sep 17 00:00:00 2001 From: Keegan Witt Date: Sun, 31 Oct 2021 00:58:18 -0400 Subject: [PATCH] Replace wget with curl (to avoid need to install wget) --- jdk11/Dockerfile | 3 +-- jdk17/Dockerfile | 3 +-- jdk8/Dockerfile | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/jdk11/Dockerfile b/jdk11/Dockerfile index d2b8a4cc..f3647938 100644 --- a/jdk11/Dockerfile +++ b/jdk11/Dockerfile @@ -22,7 +22,6 @@ RUN set -o errexit -o nounset \ && apt-get update \ && apt-get install --yes --no-install-recommends \ unzip \ - wget \ \ bzr \ git \ @@ -43,7 +42,7 @@ ENV GRADLE_VERSION 7.2 ARG GRADLE_DOWNLOAD_SHA256=f581709a9c35e9cb92e16f585d2c4bc99b2b1a5f85d2badbd3dc6bff59e1e6dd RUN set -o errexit -o nounset \ && echo "Downloading Gradle" \ - && wget --no-verbose --output-document=gradle.zip "https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip" \ + && curl --fail --show-error --silent --output gradle.zip --location "https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip" \ \ && echo "Checking download hash" \ && echo "${GRADLE_DOWNLOAD_SHA256} *gradle.zip" | sha256sum --check - \ diff --git a/jdk17/Dockerfile b/jdk17/Dockerfile index 52e2ceb1..3879dc04 100644 --- a/jdk17/Dockerfile +++ b/jdk17/Dockerfile @@ -22,7 +22,6 @@ RUN set -o errexit -o nounset \ && apt-get update \ && apt-get install --yes --no-install-recommends \ unzip \ - wget \ \ bzr \ git \ @@ -43,7 +42,7 @@ ENV GRADLE_VERSION 7.2 ARG GRADLE_DOWNLOAD_SHA256=f581709a9c35e9cb92e16f585d2c4bc99b2b1a5f85d2badbd3dc6bff59e1e6dd RUN set -o errexit -o nounset \ && echo "Downloading Gradle" \ - && wget --no-verbose --output-document=gradle.zip "https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip" \ + && curl --fail --show-error --silent --output gradle.zip --location "https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip" \ \ && echo "Checking download hash" \ && echo "${GRADLE_DOWNLOAD_SHA256} *gradle.zip" | sha256sum --check - \ diff --git a/jdk8/Dockerfile b/jdk8/Dockerfile index dbdf3f61..b882c1a6 100644 --- a/jdk8/Dockerfile +++ b/jdk8/Dockerfile @@ -22,7 +22,6 @@ RUN set -o errexit -o nounset \ && apt-get update \ && apt-get install --yes --no-install-recommends \ unzip \ - wget \ \ bzr \ git \ @@ -43,7 +42,7 @@ ENV GRADLE_VERSION 7.2 ARG GRADLE_DOWNLOAD_SHA256=f581709a9c35e9cb92e16f585d2c4bc99b2b1a5f85d2badbd3dc6bff59e1e6dd RUN set -o errexit -o nounset \ && echo "Downloading Gradle" \ - && wget --no-verbose --output-document=gradle.zip "https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip" \ + && curl --fail --show-error --silent --output gradle.zip --location "https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip" \ \ && echo "Checking download hash" \ && echo "${GRADLE_DOWNLOAD_SHA256} *gradle.zip" | sha256sum --check - \