Skip to content

Commit e226873

Browse files
committed
fix(docker): simplify CA updates with upstream packages
Signed-off-by: Adrien Langou <[email protected]>
1 parent e75fc86 commit e226873

4 files changed

Lines changed: 9 additions & 15 deletions

File tree

‎.agents/skills/launch-openshell-gator/SKILL.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,8 +371,7 @@ Symptoms: Dockerfile step failure, missing package, incompatible Codex CLI, regi
371371
Actions:
372372

373373
- Confirm the build context is `scripts/agents/gator/` or the intended temporary `--from` context.
374-
- Confirm Docker or the selected gateway runtime can pull the pinned Ubuntu and Node.js images.
375-
- The Dockerfile copies Node.js from its pinned official image into `/usr`, keeping npm packages under `/usr/lib/node_modules`.
374+
- Confirm Docker or the selected gateway runtime can pull `nvcr.io/nvidia/base/ubuntu:noble-20260917`.
376375
- For Codex CLI version experiments, adjust a temporary Docker context first.
377376
- Do not commit Dockerfile version changes unless the repo should permanently use that version.
378377

‎deploy/docker/Dockerfile.ci‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# CI runner image with all development tools pre-installed
77
# Rebuild triggered automatically when mise.toml, mise.lock, tasks, or this file changes
88

9-
FROM nvcr.io/nvidia/base/ubuntu:noble-20251013
9+
FROM nvcr.io/nvidia/base/ubuntu:noble-20260917
1010

1111
ARG DOCKER_VERSION=29.5.1
1212
ARG BUILDX_VERSION=v0.34.0
@@ -41,7 +41,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
4141
rsync \
4242
zstd \
4343
&& apt-get install -y --only-upgrade gpgv python3 \
44-
&& dpkg --compare-versions "$(dpkg-query -W -f='${Version}' ca-certificates)" ge 20260816ubuntu0.24.04.1 \
4544
&& rm -rf /var/lib/apt/lists/*
4645

4746
# Install Docker CLI and buildx plugin used by CI jobs

‎e2e/mcp-conformance/Dockerfile.client‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ FROM public.ecr.aws/docker/library/node:22.23.4-bookworm-slim@sha256:5991875dfb8
55

66
RUN apt-get update \
77
&& apt-get install -y --no-install-recommends ca-certificates iproute2 \
8-
&& dpkg --compare-versions "$(dpkg-query -W -f='${Version}' ca-certificates)" ge 20250419~deb12u2 \
98
&& rm -rf /var/lib/apt/lists/*
109

1110
ARG SANDBOX_UID=1000660000

‎scripts/agents/gator/Dockerfile‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
# tooling, but keeps the initial agent surface focused on Codex + GitHub tooling
1010
# for the gator-gate workflow.
1111

12-
FROM public.ecr.aws/docker/library/node:22.23.4-bookworm-slim@sha256:5991875dfb80938dd8a6ba3fe3e96fd04929e70792762b3319d8caadbbe229bc AS node
13-
14-
FROM public.ecr.aws/docker/library/ubuntu:24.04@sha256:68ee22004a9109b44973313b02ff7b1de250f1de0f5ecb628d73f579aaff33ac AS system
12+
FROM nvcr.io/nvidia/base/ubuntu:noble-20260917 AS system
1513

1614
ENV DEBIAN_FRONTEND=noninteractive \
1715
PYTHONDONTWRITEBYTECODE=1 \
@@ -37,28 +35,27 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
3735
openssh-sftp-server \
3836
procps \
3937
traceroute \
40-
&& dpkg --compare-versions "$(dpkg-query -W -f='${Version}' ca-certificates)" ge 20260816ubuntu0.24.04.1 \
4138
&& rm -rf /var/lib/apt/lists/*
4239

4340
RUN groupadd -r supervisor && useradd -r -g supervisor -s /usr/sbin/nologin supervisor && \
4441
groupadd -r sandbox && useradd -r -g sandbox -d /sandbox -s /bin/bash sandbox
4542

4643
FROM system AS devtools
4744

48-
COPY --from=node /usr/local/bin/node /usr/bin/node
49-
COPY --from=node /usr/local/lib/node_modules/npm /usr/lib/node_modules/npm
50-
COPY --from=node /usr/local/include/node /usr/include/node
51-
52-
RUN apt-get update && apt-get install -y --no-install-recommends \
45+
# Node.js 22 + build toolchain. Keep the default apt installs aligned with the
46+
# workload, then add the small CLI tools gator commonly needs.
47+
RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \
48+
apt-get install -y --no-install-recommends \
5349
build-essential \
5450
git \
5551
jq \
5652
less \
53+
nodejs=22.23.4-1nodesource1 \
5754
ripgrep \
5855
vim-tiny \
5956
nano \
6057
&& rm -rf /var/lib/apt/lists/* \
61-
&& node /usr/lib/node_modules/npm/bin/npm-cli.js install -g [email protected]
58+
&& npm install -g [email protected]
6259

6360
# GitHub CLI
6461
RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg \

0 commit comments

Comments
 (0)