Skip to content

Commit 6a967a8

Browse files
committed
Replace wget with curl
(to avoid need to install wget)
1 parent 6092521 commit 6a967a8

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

jdk11/Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,12 @@ RUN apt-get update \
2525
dirmngr \
2626
gnupg \
2727
unzip \
28-
wget \
2928
&& rm --recursive --force /var/lib/apt/lists/*
3029

3130
ENV GROOVY_VERSION 3.0.9
3231
RUN set -o errexit -o nounset \
3332
&& echo "Downloading Groovy" \
34-
&& wget --no-verbose --output-document=groovy.zip "https://archive.apache.org/dist/groovy/${GROOVY_VERSION}/distribution/apache-groovy-binary-${GROOVY_VERSION}.zip" \
33+
&& curl --fail --show-error --silent --output groovy.zip --location "https://archive.apache.org/dist/groovy/${GROOVY_VERSION}/distribution/apache-groovy-binary-${GROOVY_VERSION}.zip" \
3534
\
3635
&& echo "Importing keys listed in http://www.apache.org/dist/groovy/KEYS from key server" \
3736
&& export GNUPGHOME="$(mktemp -d)" \
@@ -43,7 +42,7 @@ RUN set -o errexit -o nounset \
4342
81CABC23EECA0790E8989B361FF96E10F0E13706 \
4443
\
4544
&& echo "Checking download signature" \
46-
&& wget --no-verbose --output-document=groovy.zip.asc "https://archive.apache.org/dist/groovy/${GROOVY_VERSION}/distribution/apache-groovy-binary-${GROOVY_VERSION}.zip.asc" \
45+
&& curl --fail --show-error --silent --output groovy.zip.asc --location "https://archive.apache.org/dist/groovy/${GROOVY_VERSION}/distribution/apache-groovy-binary-${GROOVY_VERSION}.zip.asc" \
4746
&& gpg --batch --no-tty --verify groovy.zip.asc groovy.zip \
4847
&& rm --recursive --force "${GNUPGHOME}" \
4948
&& rm groovy.zip.asc \

jdk17/Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,12 @@ RUN apt-get update \
2525
dirmngr \
2626
gnupg \
2727
unzip \
28-
wget \
2928
&& rm --recursive --force /var/lib/apt/lists/*
3029

3130
ENV GROOVY_VERSION 3.0.9
3231
RUN set -o errexit -o nounset \
3332
&& echo "Downloading Groovy" \
34-
&& wget --no-verbose --output-document=groovy.zip "https://archive.apache.org/dist/groovy/${GROOVY_VERSION}/distribution/apache-groovy-binary-${GROOVY_VERSION}.zip" \
33+
&& curl --fail --show-error --silent --output groovy.zip --location "https://archive.apache.org/dist/groovy/${GROOVY_VERSION}/distribution/apache-groovy-binary-${GROOVY_VERSION}.zip" \
3534
\
3635
&& echo "Importing keys listed in http://www.apache.org/dist/groovy/KEYS from key server" \
3736
&& export GNUPGHOME="$(mktemp -d)" \
@@ -43,7 +42,7 @@ RUN set -o errexit -o nounset \
4342
81CABC23EECA0790E8989B361FF96E10F0E13706 \
4443
\
4544
&& echo "Checking download signature" \
46-
&& wget --no-verbose --output-document=groovy.zip.asc "https://archive.apache.org/dist/groovy/${GROOVY_VERSION}/distribution/apache-groovy-binary-${GROOVY_VERSION}.zip.asc" \
45+
&& curl --fail --show-error --silent --output groovy.zip.asc --location "https://archive.apache.org/dist/groovy/${GROOVY_VERSION}/distribution/apache-groovy-binary-${GROOVY_VERSION}.zip.asc" \
4746
&& gpg --batch --no-tty --verify groovy.zip.asc groovy.zip \
4847
&& rm --recursive --force "${GNUPGHOME}" \
4948
&& rm groovy.zip.asc \

jdk8/Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,12 @@ RUN apt-get update \
2525
dirmngr \
2626
gnupg \
2727
unzip \
28-
wget \
2928
&& rm --recursive --force /var/lib/apt/lists/*
3029

3130
ENV GROOVY_VERSION 3.0.9
3231
RUN set -o errexit -o nounset \
3332
&& echo "Downloading Groovy" \
34-
&& wget --no-verbose --output-document=groovy.zip "https://archive.apache.org/dist/groovy/${GROOVY_VERSION}/distribution/apache-groovy-binary-${GROOVY_VERSION}.zip" \
33+
&& curl --fail --show-error --silent --output groovy.zip --location "https://archive.apache.org/dist/groovy/${GROOVY_VERSION}/distribution/apache-groovy-binary-${GROOVY_VERSION}.zip" \
3534
\
3635
&& echo "Importing keys listed in http://www.apache.org/dist/groovy/KEYS from key server" \
3736
&& export GNUPGHOME="$(mktemp -d)" \
@@ -43,7 +42,7 @@ RUN set -o errexit -o nounset \
4342
81CABC23EECA0790E8989B361FF96E10F0E13706 \
4443
\
4544
&& echo "Checking download signature" \
46-
&& wget --no-verbose --output-document=groovy.zip.asc "https://archive.apache.org/dist/groovy/${GROOVY_VERSION}/distribution/apache-groovy-binary-${GROOVY_VERSION}.zip.asc" \
45+
&& curl --fail --show-error --silent --output groovy.zip.asc --location "https://archive.apache.org/dist/groovy/${GROOVY_VERSION}/distribution/apache-groovy-binary-${GROOVY_VERSION}.zip.asc" \
4746
&& gpg --batch --no-tty --verify groovy.zip.asc groovy.zip \
4847
&& rm --recursive --force "${GNUPGHOME}" \
4948
&& rm groovy.zip.asc \

0 commit comments

Comments
 (0)