From 1a06dd42595fe8e5674ce42f744cab1c2fdfc39e 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.noble    | 2 ++
 utils/docker/Dockerfile.resolute | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/utils/docker/Dockerfile.noble b/utils/docker/Dockerfile.noble
index c5c43eba7..930c8c6e0 100644
--- a/utils/docker/Dockerfile.noble
+++ b/utils/docker/Dockerfile.noble
@@ -13,6 +13,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 && \
     # Feature-parity with node.js base images.
     apt-get install -y --no-install-recommends git openssh-client curl gpg && \
     # The Node.js binary of the driver links against libatomic (since Node.js 25).
diff --git a/utils/docker/Dockerfile.resolute b/utils/docker/Dockerfile.resolute
index 5b0b06721..bfd525758 100644
--- a/utils/docker/Dockerfile.resolute
+++ b/utils/docker/Dockerfile.resolute
@@ -13,6 +13,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 && \
     # Feature-parity with node.js base images.
     apt-get install -y --no-install-recommends git openssh-client curl gpg && \
     # The Node.js binary of the driver links against libatomic (since Node.js 25).

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

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

diff --git a/utils/docker/Dockerfile.noble b/utils/docker/Dockerfile.noble
index 930c8c6e0..5378cd10d 100644
--- a/utils/docker/Dockerfile.noble
+++ b/utils/docker/Dockerfile.noble
@@ -14,7 +14,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 && \
     # Feature-parity with node.js base images.
     apt-get install -y --no-install-recommends git openssh-client curl gpg && \
     # The Node.js binary of the driver links against libatomic (since Node.js 25).
diff --git a/utils/docker/Dockerfile.resolute b/utils/docker/Dockerfile.resolute
index bfd525758..7875b5ee9 100644
--- a/utils/docker/Dockerfile.resolute
+++ b/utils/docker/Dockerfile.resolute
@@ -14,7 +14,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 && \
     # Feature-parity with node.js base images.
     apt-get install -y --no-install-recommends git openssh-client curl gpg && \
     # The Node.js binary of the driver links against libatomic (since Node.js 25).