From 120522e7c5bc5c28a52a08971297b7c941200b86 Mon Sep 17 00:00:00 2001
From: Yury Semikhatsky <yurys@chromium.org>
Date: Wed, 11 Nov 2026 09:12:06 -0800
Subject: [PATCH 1/2] fix(docker): upgrade base image packages during the build

References: https://github.com/microsoft/playwright/issues/44055
---
 utils/docker/Dockerfile.jammy    | 2 ++
 utils/docker/Dockerfile.noble    | 2 ++
 utils/docker/Dockerfile.resolute | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/utils/docker/Dockerfile.jammy b/utils/docker/Dockerfile.jammy
index fce58fc82..453e6c8ba 100644
--- a/utils/docker/Dockerfile.jammy
+++ b/utils/docker/Dockerfile.jammy
@@ -14,6 +14,8 @@ ENV LC_ALL=C.UTF-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 && \
+    # Pick up security fixes that the base image does not have yet.
+    apt-get upgrade -y -o Acquire::Retries=0 && \
     apt-get install -y --no-install-recommends openjdk-25-jdk \
     # Install utilities required for downloading browsers
     wget \
diff --git a/utils/docker/Dockerfile.noble b/utils/docker/Dockerfile.noble
index 07d4b8c3b..664ec989e 100644
--- a/utils/docker/Dockerfile.noble
+++ b/utils/docker/Dockerfile.noble
@@ -14,6 +14,8 @@ ENV LC_ALL=C.UTF-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 && \
+    # Pick up security fixes that the base image does not have yet.
+    apt-get upgrade -y -o Acquire::Retries=0 && \
     apt-get install -y --no-install-recommends openjdk-25-jdk \
     # Install utilities required for downloading browsers
     wget \
diff --git a/utils/docker/Dockerfile.resolute b/utils/docker/Dockerfile.resolute
index 58b0ff6ac..7b7750613 100644
--- a/utils/docker/Dockerfile.resolute
+++ b/utils/docker/Dockerfile.resolute
@@ -14,6 +14,8 @@ ENV LC_ALL=C.UTF-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 && \
+    # Pick up security fixes that the base image does not have yet.
+    apt-get upgrade -y -o Acquire::Retries=0 && \
     apt-get install -y --no-install-recommends openjdk-25-jdk \
     # Ubuntu 26.04 ships Maven 3.9.12
     maven \

From b2a95ed559d53dfaeda7f4fdfca150dc80d1b6bb Mon Sep 17 00:00:00 2001
From: Yury Semikhatsky <yurys@chromium.org>
Date: Wed, 11 Nov 2026 10:01:42 -0800
Subject: [PATCH 2/2] chore(docker): drop Acquire::Retries=0 from the upgrade
 step

---
 utils/docker/Dockerfile.jammy    | 2 +-
 utils/docker/Dockerfile.noble    | 2 +-
 utils/docker/Dockerfile.resolute | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/utils/docker/Dockerfile.jammy b/utils/docker/Dockerfile.jammy
index 453e6c8ba..70c2f8ca7 100644
--- a/utils/docker/Dockerfile.jammy
+++ b/utils/docker/Dockerfile.jammy
@@ -15,7 +15,7 @@ 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 && \
     # Pick up security fixes that the base image does not have yet.
-    apt-get upgrade -y -o Acquire::Retries=0 && \
+    apt-get upgrade -y && \
     apt-get install -y --no-install-recommends openjdk-25-jdk \
     # Install utilities required for downloading browsers
     wget \
diff --git a/utils/docker/Dockerfile.noble b/utils/docker/Dockerfile.noble
index 664ec989e..b52e7d72d 100644
--- a/utils/docker/Dockerfile.noble
+++ b/utils/docker/Dockerfile.noble
@@ -15,7 +15,7 @@ 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 && \
     # Pick up security fixes that the base image does not have yet.
-    apt-get upgrade -y -o Acquire::Retries=0 && \
+    apt-get upgrade -y && \
     apt-get install -y --no-install-recommends openjdk-25-jdk \
     # Install utilities required for downloading browsers
     wget \
diff --git a/utils/docker/Dockerfile.resolute b/utils/docker/Dockerfile.resolute
index 7b7750613..1488b20ea 100644
--- a/utils/docker/Dockerfile.resolute
+++ b/utils/docker/Dockerfile.resolute
@@ -15,7 +15,7 @@ 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 && \
     # Pick up security fixes that the base image does not have yet.
-    apt-get upgrade -y -o Acquire::Retries=0 && \
+    apt-get upgrade -y && \
     apt-get install -y --no-install-recommends openjdk-25-jdk \
     # Ubuntu 26.04 ships Maven 3.9.12
     maven \