use wget everywhere

microsoft · Sep 30, 2024 · 0dd25c3 · 0dd25c3
1 parent 99e19ce
commit 0dd25c3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 15 deletions.
diff --git a/utils/docker/Dockerfile.focal b/utils/docker/Dockerfile.focal
@@ -9,8 +9,6 @@ ARG DOCKER_IMAGE_NAME_TEMPLATE="mcr.microsoft.com/playwright/java:v%version%-foc
 RUN apt-get update && \
     apt-get install -y --no-install-recommends openjdk-21-jdk \
     # Install utilities required for downloading browsers
-    curl \
-    # Use wget as per https://github.com/microsoft/playwright-java/issues/1678
     wget \
     # Install utilities required for downloading driver
     unzip \
@@ -23,7 +21,7 @@ RUN apt-get update && \
 # Ubuntu 22.04 and earlier come with Maven 3.6.3 which fails with
 # Java 21, so we install latest Maven from Apache instead.
 RUN VERSION=3.9.6 && \
-    curl -o - https://archive.apache.org/dist/maven/maven-3/$VERSION/binaries/apache-maven-$VERSION-bin.tar.gz | tar zxfv - -C /opt/ && \
+    wget -O - https://archive.apache.org/dist/maven/maven-3/$VERSION/binaries/apache-maven-$VERSION-bin.tar.gz | tar zxfv - -C /opt/ && \
     ln -s /opt/apache-maven-$VERSION/bin/mvn /usr/local/bin/
 
 ARG PW_TARGET_ARCH
@@ -44,8 +42,6 @@ COPY . /tmp/pw-java
 
 RUN cd /tmp/pw-java && \
     ./scripts/download_driver.sh && \
-    # Remove wget as per https://github.com/microsoft/playwright-java/issues/1678
-    apt-get remove -y wget && \
     mvn install -D skipTests --no-transfer-progress && \
     DEBIAN_FRONTEND=noninteractive mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI \
                      -D exec.args="install-deps" -f playwright/pom.xml --no-transfer-progress && \

diff --git a/utils/docker/Dockerfile.jammy b/utils/docker/Dockerfile.jammy
@@ -9,8 +9,6 @@ ARG DOCKER_IMAGE_NAME_TEMPLATE="mcr.microsoft.com/playwright/java:v%version%-jam
 RUN apt-get update && \
     apt-get install -y --no-install-recommends openjdk-21-jdk \
     # Install utilities required for downloading browsers
-    curl \
-    # Use wget as per https://github.com/microsoft/playwright-java/issues/1678
     wget \
     # Install utilities required for downloading driver
     unzip \
@@ -23,7 +21,7 @@ RUN apt-get update && \
 # Ubuntu 22.04 and earlier come with Maven 3.6.3 which fails with
 # Java 21, so we install latest Maven from Apache instead.
 RUN VERSION=3.9.6 && \
-    curl -o - https://archive.apache.org/dist/maven/maven-3/$VERSION/binaries/apache-maven-$VERSION-bin.tar.gz | tar zxfv - -C /opt/ && \
+    wget -O - https://archive.apache.org/dist/maven/maven-3/$VERSION/binaries/apache-maven-$VERSION-bin.tar.gz | tar zxfv - -C /opt/ && \
     ln -s /opt/apache-maven-$VERSION/bin/mvn /usr/local/bin/
 
 ARG PW_TARGET_ARCH
@@ -44,8 +42,6 @@ COPY . /tmp/pw-java
 
 RUN cd /tmp/pw-java && \
     ./scripts/download_driver.sh && \
-    # Remove wget as per https://github.com/microsoft/playwright-java/issues/1678
-    apt-get remove -y wget && \
     mvn install -D skipTests --no-transfer-progress && \
     DEBIAN_FRONTEND=noninteractive mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI \
                      -D exec.args="install-deps" -f playwright/pom.xml --no-transfer-progress && \

diff --git a/utils/docker/Dockerfile.noble b/utils/docker/Dockerfile.noble
@@ -9,8 +9,6 @@ ARG DOCKER_IMAGE_NAME_TEMPLATE="mcr.microsoft.com/playwright/java:v%version%-nob
 RUN apt-get update && \
     apt-get install -y --no-install-recommends openjdk-21-jdk \
     # Install utilities required for downloading browsers
-    curl \
-    # Use wget as per https://github.com/microsoft/playwright-java/issues/1678
     wget \
     # Install utilities required for downloading driver
     unzip \
@@ -23,7 +21,7 @@ RUN apt-get update && \
 # Ubuntu 22.04 and earlier come with Maven 3.6.3 which fails with
 # Java 21, so we install latest Maven from Apache instead.
 RUN VERSION=3.9.6 && \
-    curl -o - https://archive.apache.org/dist/maven/maven-3/$VERSION/binaries/apache-maven-$VERSION-bin.tar.gz | tar zxfv - -C /opt/ && \
+    wget -O - https://archive.apache.org/dist/maven/maven-3/$VERSION/binaries/apache-maven-$VERSION-bin.tar.gz | tar zxfv - -C /opt/ && \
     ln -s /opt/apache-maven-$VERSION/bin/mvn /usr/local/bin/
 
 ARG PW_TARGET_ARCH
@@ -44,8 +42,6 @@ COPY . /tmp/pw-java
 
 RUN cd /tmp/pw-java && \
     ./scripts/download_driver.sh && \
-    # Remove wget as per https://github.com/microsoft/playwright-java/issues/1678
-    apt-get remove -y wget && \
     mvn install -D skipTests --no-transfer-progress && \
     DEBIAN_FRONTEND=noninteractive mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI \
                      -D exec.args="install-deps" -f playwright/pom.xml --no-transfer-progress && \