Replace wget with curl

keeganwitt · keeganwitt · commit bf7f9c88eb64 · 2021-10-31T00:58:18.000-04:00
(to avoid need to install wget)
diff --git a/jdk11-alpine/Dockerfile b/jdk11-alpine/Dockerfile
@@ -36,7 +36,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 -c - \
diff --git 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-alpine/Dockerfile b/jdk17-alpine/Dockerfile
@@ -36,7 +36,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 -c - \
diff --git 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
@@ -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 - \

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ ENV GRADLE_VERSION 7.2`
`36`	`36`	`ARG GRADLE_DOWNLOAD_SHA256=f581709a9c35e9cb92e16f585d2c4bc99b2b1a5f85d2badbd3dc6bff59e1e6dd`
`37`	`37`	`RUN set -o errexit -o nounset \`
`38`	`38`	`&& echo "Downloading Gradle" \`
`39`		`- && wget --no-verbose --output-document=gradle.zip "https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip" \`
	`39`	`+ && curl --fail --show-error --silent --output gradle.zip --location "https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip" \`
`40`	`40`	`\`
`41`	`41`	`&& echo "Checking download hash" \`
`42`	`42`	`&& echo "${GRADLE_DOWNLOAD_SHA256} *gradle.zip" \| sha256sum -c - \`