From e18b3267068244c336d8c5b8776b53491fa748e7 Mon Sep 17 00:00:00 2001 From: Marcus Eagan Date: Wed, 21 Oct 2026 13:18:46 +0100 Subject: [PATCH 1/2] Upgrade git to 1:2.43.0-1ubuntu7.4 Ubuntu replaced git 1:2.43.0-1ubuntu7.3 with a 7.4 security update and dropped 7.3 from the noble archive, so the pinned install fails with "Version '1:2.43.0-1ubuntu7.3' for 'git' was not found". Co-Authored-By: Claude Opus 5.5 (1M context) --- deployment-examples/docker-compose/Dockerfile | 2 +- tools/toolchain-buck2/Dockerfile | 2 +- tools/toolchain-drake/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deployment-examples/docker-compose/Dockerfile b/deployment-examples/docker-compose/Dockerfile index d785204aa92..f0c65c06ad3 100644 --- a/deployment-examples/docker-compose/Dockerfile +++ b/deployment-examples/docker-compose/Dockerfile @@ -47,7 +47,7 @@ RUN ARCH_SUFFIX=amd64 \ && apt-get update \ && DEBIAN_FRONTEND=noninteractive \ apt-get install --no-install-recommends -y \ - git=1:2.43.0-1ubuntu7.3 \ + git=1:2.43.0-1ubuntu7.4 \ gcc=4:13.2.0-7ubuntu1 \ g++=4:13.2.0-7ubuntu1 \ python3=3.12.3-0ubuntu2.1 \ diff --git a/tools/toolchain-buck2/Dockerfile b/tools/toolchain-buck2/Dockerfile index e2d44c960e9..6c4af752538 100644 --- a/tools/toolchain-buck2/Dockerfile +++ b/tools/toolchain-buck2/Dockerfile @@ -16,7 +16,7 @@ FROM ubuntu:noble-20250925@sha256:728785b59223d755e3e5c5af178fab1be7031f3522c5ccd7a0b32b80d8248123 AS dependencies RUN apt-get update && DEBIAN_FRONTEND=noninteractive \ apt-get install -y --no-install-recommends \ - git=1:2.43.0-1ubuntu7.3 \ + git=1:2.43.0-1ubuntu7.4 \ ca-certificates=20240203 \ curl=8.5.0-2ubuntu10.11 \ python3=3.12.3-0ubuntu2.1 \ diff --git a/tools/toolchain-drake/Dockerfile b/tools/toolchain-drake/Dockerfile index dae04f59c9a..a5a15201132 100644 --- a/tools/toolchain-drake/Dockerfile +++ b/tools/toolchain-drake/Dockerfile @@ -15,7 +15,7 @@ FROM ubuntu:noble-20250925@sha256:728785b59223d755e3e5c5af178fab1be7031f3522c5ccd7a0b32b80d8248123 AS dependencies RUN apt-get update && DEBIAN_FRONTEND=noninteractive \ apt-get install --no-install-recommends -y \ - git=1:2.43.0-1ubuntu7.3 \ + git=1:2.43.0-1ubuntu7.4 \ ca-certificates=20240203 \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* \ From 513882dac063450f37542abaad27fcdef9b1fc3f Mon Sep 17 00:00:00 2001 From: Marcus Eagan Date: Wed, 21 Oct 2026 13:22:55 +0100 Subject: [PATCH 2/2] Upgrade curl to 8.5.0-2ubuntu10.16 in the toolchain images The docker-compose image moved to 10.16 in #2942, but the buck2 and nativelink toolchain images still pin 10.11, which is no longer in the noble archive. Co-Authored-By: Claude Opus 5.5 (1M context) --- tools/toolchain-buck2/Dockerfile | 2 +- tools/toolchain-nativelink/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/toolchain-buck2/Dockerfile b/tools/toolchain-buck2/Dockerfile index 6c4af752538..6f81f34c8b8 100644 --- a/tools/toolchain-buck2/Dockerfile +++ b/tools/toolchain-buck2/Dockerfile @@ -18,7 +18,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive \ apt-get install -y --no-install-recommends \ git=1:2.43.0-1ubuntu7.4 \ ca-certificates=20240203 \ - curl=8.5.0-2ubuntu10.11 \ + curl=8.5.0-2ubuntu10.16 \ python3=3.12.3-0ubuntu2.1 \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* \ diff --git a/tools/toolchain-nativelink/Dockerfile b/tools/toolchain-nativelink/Dockerfile index d13f8b49fd5..4dc4f748edd 100644 --- a/tools/toolchain-nativelink/Dockerfile +++ b/tools/toolchain-nativelink/Dockerfile @@ -23,7 +23,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-instal gcc=4:13.2.0-7ubuntu1 \ g++=4:13.2.0-7ubuntu1 \ python3=3.12.3-0ubuntu2.1 \ - curl=8.5.0-2ubuntu10.11 \ + curl=8.5.0-2ubuntu10.16 \ ca-certificates=20240203 \ && apt-get clean \ && rm -rf /var/lib/apt/lists/*