From 8adf4cbabad116771c6806fd596a85fa47d43fef Mon Sep 17 00:00:00 2001 From: Yury Semikhatsky Date: Wed, 14 Oct 2026 11:47:26 -0700 Subject: [PATCH 1/2] devops(docker): download Maven from Maven Central with retries archive.apache.org times out intermittently on CI runners. Fetch the Maven distribution from Maven Central instead and let wget retry with a short timeout. --- utils/docker/Dockerfile.jammy | 5 ++++- utils/docker/Dockerfile.noble | 5 ++++- utils/docker/Dockerfile.resolute | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/utils/docker/Dockerfile.jammy b/utils/docker/Dockerfile.jammy index f049bb896..9b5fa00f3 100644 --- a/utils/docker/Dockerfile.jammy +++ b/utils/docker/Dockerfile.jammy @@ -28,7 +28,10 @@ RUN find /etc/apt -type f \( -name '*.list' -o -name '*.sources' \) \ # Ubuntu 22.04 and earlier come with Maven 3.6.3 which fails with # Java 25, so we install latest Maven from Apache instead. RUN VERSION=3.9.12 && \ - wget -O - https://archive.apache.org/dist/maven/maven-3/$VERSION/binaries/apache-maven-$VERSION-bin.tar.gz | tar zxfv - -C /opt/ && \ + wget --tries=3 --timeout=30 --retry-connrefused -O /tmp/maven.tar.gz \ + https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/$VERSION/apache-maven-$VERSION-bin.tar.gz && \ + tar zxf /tmp/maven.tar.gz -C /opt/ && \ + rm /tmp/maven.tar.gz && \ ln -s /opt/apache-maven-$VERSION/bin/mvn /usr/local/bin/ ARG PW_TARGET_ARCH diff --git a/utils/docker/Dockerfile.noble b/utils/docker/Dockerfile.noble index 59c01754e..29ff1c9b9 100644 --- a/utils/docker/Dockerfile.noble +++ b/utils/docker/Dockerfile.noble @@ -28,7 +28,10 @@ RUN find /etc/apt -type f \( -name '*.list' -o -name '*.sources' \) \ # Ubuntu 22.04 and earlier come with Maven 3.6.3 which fails with # Java 25, so we install latest Maven from Apache instead. RUN VERSION=3.9.12 && \ - wget -O - https://archive.apache.org/dist/maven/maven-3/$VERSION/binaries/apache-maven-$VERSION-bin.tar.gz | tar zxfv - -C /opt/ && \ + wget --tries=3 --timeout=30 --retry-connrefused -O /tmp/maven.tar.gz \ + https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/$VERSION/apache-maven-$VERSION-bin.tar.gz && \ + tar zxf /tmp/maven.tar.gz -C /opt/ && \ + rm /tmp/maven.tar.gz && \ ln -s /opt/apache-maven-$VERSION/bin/mvn /usr/local/bin/ ARG PW_TARGET_ARCH diff --git a/utils/docker/Dockerfile.resolute b/utils/docker/Dockerfile.resolute index fb9b72c7f..b9a6450e5 100644 --- a/utils/docker/Dockerfile.resolute +++ b/utils/docker/Dockerfile.resolute @@ -28,7 +28,10 @@ RUN find /etc/apt -type f \( -name '*.list' -o -name '*.sources' \) \ # Ubuntu 22.04 and earlier come with Maven 3.6.3 which fails with # Java 25, so we install latest Maven from Apache instead. RUN VERSION=3.9.12 && \ - wget -O - https://archive.apache.org/dist/maven/maven-3/$VERSION/binaries/apache-maven-$VERSION-bin.tar.gz | tar zxfv - -C /opt/ && \ + wget --tries=3 --timeout=30 --retry-connrefused -O /tmp/maven.tar.gz \ + https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/$VERSION/apache-maven-$VERSION-bin.tar.gz && \ + tar zxf /tmp/maven.tar.gz -C /opt/ && \ + rm /tmp/maven.tar.gz && \ ln -s /opt/apache-maven-$VERSION/bin/mvn /usr/local/bin/ ARG PW_TARGET_ARCH From c275e509b9f95134691f531647ba862460b3808b Mon Sep 17 00:00:00 2001 From: Yury Semikhatsky Date: Wed, 14 Oct 2026 12:13:41 -0700 Subject: [PATCH 2/2] devops(docker): use Ubuntu's Maven package in the resolute image Ubuntu 26.04 ships Maven 3.9.12, the same version we were downloading, and apt goes through the configured Ubuntu mirror. --- utils/docker/Dockerfile.resolute | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/utils/docker/Dockerfile.resolute b/utils/docker/Dockerfile.resolute index b9a6450e5..905962beb 100644 --- a/utils/docker/Dockerfile.resolute +++ b/utils/docker/Dockerfile.resolute @@ -15,6 +15,8 @@ RUN find /etc/apt -type f \( -name '*.list' -o -name '*.sources' \) \ -exec sed -i "s|http://archive.ubuntu.com|http://${UBUNTU_MIRROR_PREFIX}archive.ubuntu.com|g; s|http://ports.ubuntu.com|http://${UBUNTU_MIRROR_PREFIX}ports.ubuntu.com|g" {} + && \ apt-get update && \ apt-get install -y --no-install-recommends openjdk-25-jdk \ + # Ubuntu 26.04 ships Maven 3.9.12 + maven \ # Install utilities required for downloading browsers wget \ # Install utilities required for downloading driver @@ -25,15 +27,6 @@ RUN find /etc/apt -type f \( -name '*.list' -o -name '*.sources' \) \ # Create the pwuser useradd -m -s /bin/bash pwuser -# Ubuntu 22.04 and earlier come with Maven 3.6.3 which fails with -# Java 25, so we install latest Maven from Apache instead. -RUN VERSION=3.9.12 && \ - wget --tries=3 --timeout=30 --retry-connrefused -O /tmp/maven.tar.gz \ - https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/$VERSION/apache-maven-$VERSION-bin.tar.gz && \ - tar zxf /tmp/maven.tar.gz -C /opt/ && \ - rm /tmp/maven.tar.gz && \ - ln -s /opt/apache-maven-$VERSION/bin/mvn /usr/local/bin/ - ARG PW_TARGET_ARCH ENV JAVA_HOME=/usr/lib/jvm/java-25-openjdk-${PW_TARGET_ARCH}