Skip to content

Update to Debian Trixie #1069

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
tianon merged 1 commit into from
Aug 13, 2025
Merged

Update to Debian Trixie #1069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion adsb/acarsdec/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#

FROM debian:bookworm-slim AS base
FROM debian:trixie-slim AS base

FROM base AS build

Expand Down
2 changes: 1 addition & 1 deletion adsb/acarsdec/Dockerfile.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bookworm-slim AS base
FROM debian:trixie-slim AS base

FROM base AS build

Expand Down
2 changes: 1 addition & 1 deletion adsb/readsb/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#

FROM debian:bookworm-slim AS base
FROM debian:trixie-slim AS base

FROM base AS build

Expand Down
2 changes: 1 addition & 1 deletion adsb/readsb/Dockerfile.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bookworm-slim AS base
FROM debian:trixie-slim AS base

FROM base AS build

Expand Down
2 changes: 1 addition & 1 deletion beets/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#

FROM python:3.13-slim-bookworm
FROM python:3.13-slim-trixie

ENV BEETS_VERSION 2.3.1

Expand Down
2 changes: 1 addition & 1 deletion beets/versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"version": "2.3.1",
"python": {
"version": "3.13",
"from": "python:3.13-slim-bookworm",
"from": "python:3.13-slim-trixie",
"arches": [
"amd64",
"arm32v5",
Expand Down
2 changes: 1 addition & 1 deletion beets/versions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ source "$dir/../.libs/pypi.sh"

versions_hooks+=( hook_no-prereleases )

export TIANON_PYTHON_FROM_TEMPLATE='python:%%PYTHON%%-slim-bookworm'
export TIANON_PYTHON_FROM_TEMPLATE='python:%%PYTHON%%-slim-trixie'

json="$(pypi 'beets')"

Expand Down
2 changes: 1 addition & 1 deletion containerd/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#

FROM debian:bookworm-slim
FROM debian:trixie-slim

# runtime deps
RUN set -eux; \
Expand Down
2 changes: 1 addition & 1 deletion containerd/Dockerfile.1.6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#

FROM debian:bookworm-slim
FROM debian:trixie-slim

# runtime deps
RUN set -eux; \
Expand Down
2 changes: 1 addition & 1 deletion containerd/Dockerfile.1.7
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#

FROM debian:bookworm-slim
FROM debian:trixie-slim

# runtime deps
RUN set -eux; \
Expand Down
2 changes: 1 addition & 1 deletion containerd/Dockerfile.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#

FROM debian:bookworm-slim
FROM debian:trixie-slim

# runtime deps
RUN set -eux; \
Expand Down
2 changes: 1 addition & 1 deletion containerd/Dockerfile.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bookworm-slim
FROM debian:trixie-slim

# runtime deps
RUN set -eux; \
Expand Down
2 changes: 1 addition & 1 deletion coredns/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#

FROM debian:bookworm-slim
FROM debian:trixie-slim

# https://github.com/coredns/coredns/releases
ENV COREDNS_VERSION 1.12.3
Expand Down
2 changes: 1 addition & 1 deletion coredns/Dockerfile.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bookworm-slim
FROM debian:trixie-slim

# https://github.com/coredns/coredns/releases
ENV COREDNS_VERSION {{ .version }}
Expand Down
2 changes: 1 addition & 1 deletion diffoscope/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#

FROM python:3.10-slim-bookworm
FROM python:3.10-slim-trixie

RUN set -eux; \
apt-get update; \
Expand Down
2 changes: 1 addition & 1 deletion diffoscope/versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"version": "303",
"python": {
"version": "3.10",
"from": "python:3.10-slim-bookworm",
"from": "python:3.10-slim-trixie",
"arches": [
"amd64",
"arm32v5",
Expand Down
2 changes: 1 addition & 1 deletion diffoscope/versions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ source "$dir/../.libs/pypi.sh"

versions_hooks+=( hook_no-prereleases )

export TIANON_PYTHON_FROM_TEMPLATE='python:%%PYTHON%%-slim-bookworm'
export TIANON_PYTHON_FROM_TEMPLATE='python:%%PYTHON%%-slim-trixie'

json="$(pypi 'diffoscope')"

Expand Down
20 changes: 14 additions & 6 deletions docker-desktop/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# This is a huge ugly hack that barely works for the way I play with it.
#

FROM rust:1.75-slim-bookworm AS virtiofsd
FROM rust:1.89-slim-trixie AS virtiofsd

RUN set -eux; \
apt-get update; \
Expand Down Expand Up @@ -44,7 +44,7 @@ RUN patch --strip=1 --input=virtiofsd.patch
RUN cargo build --release

# https://docs.docker.com/desktop/linux/
FROM debian:bookworm-slim
FROM debian:trixie-slim

# https://docs.docker.com/desktop/release-notes/
# https://docs.docker.com/desktop/linux/install/
Expand Down Expand Up @@ -85,12 +85,18 @@ RUN set -eux; \
apt-get install -y --no-install-recommends ./docker-desktop.deb; \
rm docker-desktop.deb; \
\
# yay, missing Depends again!
apt-get install -y --no-install-recommends \
libdrm2 \
libgbm1 \
; \
\
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
rm -rf /var/lib/apt/lists/*
# smoke test
RUN set -eux; \
find /opt/docker-desktop -type f -executable -exec bash -Eeuo pipefail -xc 'ldd "$@" || :' -- '{}' + > /tmp/ldd.txt; \
! grep 'not found' /tmp/ldd.txt; \
if grep 'not found' /tmp/ldd.txt; then exit 1; fi; \
rm /tmp/ldd.txt

ENV PATH /opt/docker-desktop/bin:$PATH
Expand All @@ -107,9 +113,11 @@ RUN set -eux; \
after="$(virtiofsd --version 2>&1)"; \
[ "$before" = "$after" ]; \
\
# divert QEMU's "virtiofsd" to make sure it doesn't get used accidentally
[ -s /usr/lib/qemu/virtiofsd ]; \
dpkg-divert --add --rename --divert /usr/lib/qemu/virtiofsd.orig /usr/lib/qemu/virtiofsd
# explicitly divert QEMU's "virtiofsd" to make sure it doesn't get installed/used accidentally (in trixie it moved from qemu-system-common to a dedicated virtiofsd package, which is good)
[ ! -s /usr/lib/qemu/virtiofsd ]; \
[ ! -s /usr/libexec/virtiofsd ]; \
dpkg-divert --add --rename --divert /usr/lib/qemu/virtiofsd.orig /usr/lib/qemu/virtiofsd; \
dpkg-divert --add --rename --divert /usr/libexec/virtiofsd.orig /usr/libexec/virtiofsd

RUN set -eux; \
# setting up ID maps for virtiofsd namespace: retrieving subordinate UID range: no range for <USER> found in /etc/subuid
Expand Down
20 changes: 14 additions & 6 deletions docker-desktop/Dockerfile.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# This is a huge ugly hack that barely works for the way I play with it.
#

FROM rust:1.75-slim-bookworm AS virtiofsd
FROM rust:1.89-slim-trixie AS virtiofsd

RUN set -eux; \
apt-get update; \
Expand Down Expand Up @@ -38,7 +38,7 @@ RUN patch --strip=1 --input=virtiofsd.patch
RUN cargo build --release

# https://docs.docker.com/desktop/linux/
FROM debian:bookworm-slim
FROM debian:trixie-slim

# https://docs.docker.com/desktop/release-notes/
# https://docs.docker.com/desktop/linux/install/
Expand Down Expand Up @@ -79,12 +79,18 @@ RUN set -eux; \
apt-get install -y --no-install-recommends ./docker-desktop.deb; \
rm docker-desktop.deb; \
\
# yay, missing Depends again!
apt-get install -y --no-install-recommends \
libdrm2 \
libgbm1 \
; \
\
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
rm -rf /var/lib/apt/lists/*
# smoke test
RUN set -eux; \
find /opt/docker-desktop -type f -executable -exec bash -Eeuo pipefail -xc 'ldd "$@" || :' -- '{}' + > /tmp/ldd.txt; \
! grep 'not found' /tmp/ldd.txt; \
if grep 'not found' /tmp/ldd.txt; then exit 1; fi; \
rm /tmp/ldd.txt

ENV PATH /opt/docker-desktop/bin:$PATH
Expand All @@ -101,9 +107,11 @@ RUN set -eux; \
after="$(virtiofsd --version 2>&1)"; \
[ "$before" = "$after" ]; \
\
# divert QEMU's "virtiofsd" to make sure it doesn't get used accidentally
[ -s /usr/lib/qemu/virtiofsd ]; \
dpkg-divert --add --rename --divert /usr/lib/qemu/virtiofsd.orig /usr/lib/qemu/virtiofsd
# explicitly divert QEMU's "virtiofsd" to make sure it doesn't get installed/used accidentally (in trixie it moved from qemu-system-common to a dedicated virtiofsd package, which is good)
[ ! -s /usr/lib/qemu/virtiofsd ]; \
[ ! -s /usr/libexec/virtiofsd ]; \
dpkg-divert --add --rename --divert /usr/lib/qemu/virtiofsd.orig /usr/lib/qemu/virtiofsd; \
dpkg-divert --add --rename --divert /usr/libexec/virtiofsd.orig /usr/libexec/virtiofsd

RUN set -eux; \
# setting up ID maps for virtiofsd namespace: retrieving subordinate UID range: no range for <USER> found in /etc/subuid
Expand Down
4 changes: 2 additions & 2 deletions docker-master/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#
# $ docker run -d --name dind --privileged --volume dind:/var/lib/docker tianon/docker-master

FROM golang:1.23.0-bookworm AS build
FROM golang:1.24-trixie AS build

RUN set -eux; \
apt-get update; \
Expand Down Expand Up @@ -108,7 +108,7 @@ RUN set -eux; \
chroot . "./$bin" --version; \
done

FROM golang:1.23.0-bookworm AS buildx
FROM golang:1.24-trixie AS buildx

ARG BUILDX_GITCOMMIT=c6d1e397a8d9ab6313b3f333e584a1aa52418ce2
ENV BUILDX_GITCOMMIT $BUILDX_GITCOMMIT
Expand Down
14 changes: 12 additions & 2 deletions docker-master/Dockerfile.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,17 @@
#
# $ docker run -d --name dind --privileged --volume dind:/var/lib/docker tianon/docker-master

FROM golang:{{ .go.version }}-bookworm AS build
{{
def golang(version):
version
# we only want "golang:X.Y", never "X.Y.Z"
| split(".")[0:2]
| join(".")
# TODO remove this 1.23 hack once "go.mod" in moby/moby updates to 1.24+ (we don't have a golang:1.23-trixie, only 1.24+)
| if . == "1.23" then "1.24" else . end
| "golang:\(.)-trixie"
-}}
FROM {{ golang(.go.version) }} AS build

RUN set -eux; \
apt-get update; \
Expand Down Expand Up @@ -102,7 +112,7 @@ RUN set -eux; \
chroot . "./$bin" --version; \
done

FROM golang:{{ .buildx.go.version }}-bookworm AS buildx
FROM {{ golang(.buildx.go.version) }} AS buildx

ARG BUILDX_GITCOMMIT={{ .buildx.version }}
ENV BUILDX_GITCOMMIT $BUILDX_GITCOMMIT
Expand Down
2 changes: 1 addition & 1 deletion exim4/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bookworm-slim
FROM debian:trixie-slim

RUN set -eux; \
apt-get update; \
Expand Down
2 changes: 1 addition & 1 deletion firefox/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#

FROM debian:bookworm-slim
FROM debian:trixie-slim

RUN set -eux; \
apt-get update; \
Expand Down
2 changes: 1 addition & 1 deletion firefox/Dockerfile.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bookworm-slim
FROM debian:trixie-slim

RUN set -eux; \
apt-get update; \
Expand Down
2 changes: 1 addition & 1 deletion handbrake/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#

FROM debian:bookworm-slim
FROM debian:trixie-slim

# https://github.com/HandBrake/HandBrake/releases
ENV HANDBRAKE_VERSION 1.10.0
Expand Down
2 changes: 1 addition & 1 deletion handbrake/Dockerfile.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bookworm-slim
FROM debian:trixie-slim

# https://github.com/HandBrake/HandBrake/releases
ENV HANDBRAKE_VERSION {{ .version }}
Expand Down
28 changes: 14 additions & 14 deletions infosiftr-moby/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#

FROM debian:bookworm-slim
FROM debian:trixie-slim

RUN set -eux; \
apt-get update; \
Expand All @@ -18,21 +18,21 @@ RUN set -eux; \
rm -rf /var/lib/apt/lists/*

# https://apt.tianon.xyz/moby
# https://apt.tianon.xyz/moby/dists/bookworm/tianon-moby.sources
RUN echo 'deb [ allow-insecure=yes trusted=yes ] https://apt.tianon.xyz/moby bookworm main' > /etc/apt/sources.list.d/moby.list
# https://apt.tianon.xyz/moby/dists/trixie/tianon-moby.sources
RUN echo 'deb [ allow-insecure=yes trusted=yes ] https://apt.tianon.xyz/moby trixie main' > /etc/apt/sources.list.d/moby.list
# TODO deb822

# http://apt.tianon.xyz/moby/pool/bookworm/main/moby-engine/
ENV MOBY_ENGINE_VERSION 23.0.18-1~deb12u0
# http://apt.tianon.xyz/moby/pool/bookworm/main/moby-containerd/
ENV MOBY_CONTAINERD_VERSION 1.6.38-1~deb12u0
# http://apt.tianon.xyz/moby/pool/bookworm/main/moby-runc/
ENV MOBY_RUNC_VERSION 1.1.15-2~deb12u0

# http://apt.tianon.xyz/moby/pool/bookworm/main/moby-cli/
ENV MOBY_CLI_VERSION 23.0.15-2~deb12u0
# http://apt.tianon.xyz/moby/pool/bookworm/main/moby-buildx/
ENV MOBY_BUILDX_VERSION 0.17.1-2~deb12u0
# http://apt.tianon.xyz/moby/pool/trixie/main/moby-engine/
ENV MOBY_ENGINE_VERSION 23.0.18-1~deb13u0
# http://apt.tianon.xyz/moby/pool/trixie/main/moby-containerd/
ENV MOBY_CONTAINERD_VERSION 1.6.38-1~deb13u0
# http://apt.tianon.xyz/moby/pool/trixie/main/moby-runc/
ENV MOBY_RUNC_VERSION 1.1.15-2~deb13u0

# http://apt.tianon.xyz/moby/pool/trixie/main/moby-cli/
ENV MOBY_CLI_VERSION 23.0.15-2~deb13u0
# http://apt.tianon.xyz/moby/pool/trixie/main/moby-buildx/
ENV MOBY_BUILDX_VERSION 0.17.1-2~deb13u0

RUN set -eux; \
\
Expand Down
Loading
Loading