Skip to content

Update bundled browser image runtime dependencies #446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sjmiller609 merged 2 commits into from
Oct 10, 2026
+29 −3
Merged

Update bundled browser image runtime dependencies #446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14b7267
Update bundled browser image runtime dependencies
sjmiller609 Oct 9, 2026
1061eab
Use the published Neko security release
sjmiller609 Oct 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions images/chromium-headful/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,12 @@ RUN --mount=type=cache,target=/tmp/cache/ffmpeg,sharing=locked,id=$CACHEIDPREFIX
rm -rf /tmp/ffmpeg*
EOT

FROM ghcr.io/kernel/neko/base:3.0.8-v1.6.0 AS neko
FROM ghcr.io/kernel/neko/base:3.0.8-v1.6.2 AS neko
FROM node:22-bullseye-slim AS node-22
FROM docker.io/library/docker:29.1.3-dind AS docker
FROM docker.io/library/docker:29.8.2-dind AS docker
ARG TARGETARCH
COPY shared/docker/update-containerd.sh /tmp/update-containerd.sh
RUN sh /tmp/update-containerd.sh "${TARGETARCH:-amd64}" && rm /tmp/update-containerd.sh
FROM docker.io/ubuntu:22.04

# Allow cross-compilation when building with BuildKit platforms
Expand Down
5 changes: 4 additions & 1 deletion images/chromium-headless/image/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,10 @@ RUN --mount=type=cache,target=/tmp/cache/ffmpeg,sharing=locked,id=$CACHEIDPREFIX
EOT

FROM node:22-bullseye-slim AS node-22
FROM docker.io/library/docker:29.1.3-dind AS docker
FROM docker.io/library/docker:29.8.2-dind AS docker
ARG TARGETARCH
COPY shared/docker/update-containerd.sh /tmp/update-containerd.sh
RUN sh /tmp/update-containerd.sh "${TARGETARCH:-amd64}" && rm /tmp/update-containerd.sh
FROM docker.io/ubuntu:22.04

# Allow cross-compilation when building with BuildKit platforms
Expand Down
20 changes: 20 additions & 0 deletions shared/docker/update-containerd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#!/bin/sh
set -eux

VERSION=2.4.1
ARCH="$1"
case "$ARCH" in
amd64) SHA256=02ad3a7e80d7d2c018c7134d5eca7e301283db6895f100b957fb52ad8e5a30fd ;;
arm64) SHA256=d3aba9347650505df79858bb9cbf1be52080fd8145f72dd9308d4936f487fb74 ;;
*) echo "Unsupported architecture: $ARCH" >&2; exit 1 ;;
esac

ARCHIVE="containerd-static-${VERSION}-linux-${ARCH}.tar.gz"
TMPDIR=$(mktemp -d)
trap 'rm -rf "$TMPDIR"' EXIT
cd "$TMPDIR"

# Docker's bundled containerd still embeds an older gRPC release.
wget -O "$ARCHIVE" "https://github.com/containerd/containerd/releases/download/v${VERSION}/${ARCHIVE}"
echo "$SHA256 $ARCHIVE" | sha256sum -c -
tar -xzf "$ARCHIVE" -C /usr/local bin/containerd bin/containerd-shim-runc-v2
Comment thread
sjmiller609 marked this conversation as resolved.
Loading