diff --git a/adsb/acarsdec/Dockerfile b/adsb/acarsdec/Dockerfile index 45b968abe49..76b1609c410 100644 --- a/adsb/acarsdec/Dockerfile +++ b/adsb/acarsdec/Dockerfile @@ -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 diff --git a/adsb/acarsdec/Dockerfile.template b/adsb/acarsdec/Dockerfile.template index 47b71b50cf8..9abc22ec3f0 100644 --- a/adsb/acarsdec/Dockerfile.template +++ b/adsb/acarsdec/Dockerfile.template @@ -1,4 +1,4 @@ -FROM debian:bookworm-slim AS base +FROM debian:trixie-slim AS base FROM base AS build diff --git a/adsb/readsb/Dockerfile b/adsb/readsb/Dockerfile index c813a776ccf..6dc257a1b5a 100644 --- a/adsb/readsb/Dockerfile +++ b/adsb/readsb/Dockerfile @@ -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 diff --git a/adsb/readsb/Dockerfile.template b/adsb/readsb/Dockerfile.template index d1234e80036..42469610bc4 100644 --- a/adsb/readsb/Dockerfile.template +++ b/adsb/readsb/Dockerfile.template @@ -1,4 +1,4 @@ -FROM debian:bookworm-slim AS base +FROM debian:trixie-slim AS base FROM base AS build diff --git a/beets/Dockerfile b/beets/Dockerfile index f4220d7cfc6..6e23740f13f 100644 --- a/beets/Dockerfile +++ b/beets/Dockerfile @@ -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 diff --git a/beets/versions.json b/beets/versions.json index d42af9bf3bd..d3a6187990c 100644 --- a/beets/versions.json +++ b/beets/versions.json @@ -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", diff --git a/beets/versions.sh b/beets/versions.sh index 34b9d3979e9..316f050395a 100755 --- a/beets/versions.sh +++ b/beets/versions.sh @@ -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')" diff --git a/containerd/Dockerfile b/containerd/Dockerfile index b976d679071..33fc572454b 100644 --- a/containerd/Dockerfile +++ b/containerd/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bookworm-slim +FROM debian:trixie-slim # runtime deps RUN set -eux; \ diff --git a/containerd/Dockerfile.1.6 b/containerd/Dockerfile.1.6 index c6a361ad66a..bcdedbcb980 100644 --- a/containerd/Dockerfile.1.6 +++ b/containerd/Dockerfile.1.6 @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bookworm-slim +FROM debian:trixie-slim # runtime deps RUN set -eux; \ diff --git a/containerd/Dockerfile.1.7 b/containerd/Dockerfile.1.7 index d81642be68a..cae41d96dec 100644 --- a/containerd/Dockerfile.1.7 +++ b/containerd/Dockerfile.1.7 @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bookworm-slim +FROM debian:trixie-slim # runtime deps RUN set -eux; \ diff --git a/containerd/Dockerfile.rc b/containerd/Dockerfile.rc index d686309e1cd..edbe25620a1 100644 --- a/containerd/Dockerfile.rc +++ b/containerd/Dockerfile.rc @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bookworm-slim +FROM debian:trixie-slim # runtime deps RUN set -eux; \ diff --git a/containerd/Dockerfile.template b/containerd/Dockerfile.template index 94ca1bdc4d7..19cae057360 100644 --- a/containerd/Dockerfile.template +++ b/containerd/Dockerfile.template @@ -1,4 +1,4 @@ -FROM debian:bookworm-slim +FROM debian:trixie-slim # runtime deps RUN set -eux; \ diff --git a/coredns/Dockerfile b/coredns/Dockerfile index cf63320bf6c..42ef9d78bce 100644 --- a/coredns/Dockerfile +++ b/coredns/Dockerfile @@ -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 diff --git a/coredns/Dockerfile.template b/coredns/Dockerfile.template index 6b06f294aa4..16e90a46d3f 100644 --- a/coredns/Dockerfile.template +++ b/coredns/Dockerfile.template @@ -1,4 +1,4 @@ -FROM debian:bookworm-slim +FROM debian:trixie-slim # https://github.com/coredns/coredns/releases ENV COREDNS_VERSION {{ .version }} diff --git a/diffoscope/Dockerfile b/diffoscope/Dockerfile index c8129a762f6..2a842450f93 100644 --- a/diffoscope/Dockerfile +++ b/diffoscope/Dockerfile @@ -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; \ diff --git a/diffoscope/versions.json b/diffoscope/versions.json index 3d59de20321..5e1cae4b62b 100644 --- a/diffoscope/versions.json +++ b/diffoscope/versions.json @@ -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", diff --git a/diffoscope/versions.sh b/diffoscope/versions.sh index 010b253dd12..370680c8ab9 100755 --- a/diffoscope/versions.sh +++ b/diffoscope/versions.sh @@ -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')" diff --git a/docker-desktop/Dockerfile b/docker-desktop/Dockerfile index f59a5f4f641..ef3a669830c 100644 --- a/docker-desktop/Dockerfile +++ b/docker-desktop/Dockerfile @@ -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; \ @@ -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/ @@ -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 @@ -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 found in /etc/subuid diff --git a/docker-desktop/Dockerfile.template b/docker-desktop/Dockerfile.template index a328a7f8ff4..d12f9be5833 100644 --- a/docker-desktop/Dockerfile.template +++ b/docker-desktop/Dockerfile.template @@ -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; \ @@ -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/ @@ -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 @@ -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 found in /etc/subuid diff --git a/docker-master/Dockerfile b/docker-master/Dockerfile index 7ec0b8b7119..4b61a5f1295 100644 --- a/docker-master/Dockerfile +++ b/docker-master/Dockerfile @@ -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; \ @@ -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 diff --git a/docker-master/Dockerfile.template b/docker-master/Dockerfile.template index a897cba2cfa..8b2d460f71e 100644 --- a/docker-master/Dockerfile.template +++ b/docker-master/Dockerfile.template @@ -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; \ @@ -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 diff --git a/exim4/Dockerfile b/exim4/Dockerfile index 995641002ef..1e6e1b1e870 100644 --- a/exim4/Dockerfile +++ b/exim4/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bookworm-slim +FROM debian:trixie-slim RUN set -eux; \ apt-get update; \ diff --git a/firefox/Dockerfile b/firefox/Dockerfile index 8e888f70da1..58596f118e7 100644 --- a/firefox/Dockerfile +++ b/firefox/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bookworm-slim +FROM debian:trixie-slim RUN set -eux; \ apt-get update; \ diff --git a/firefox/Dockerfile.template b/firefox/Dockerfile.template index b5c84be6491..acfffc4ecb1 100644 --- a/firefox/Dockerfile.template +++ b/firefox/Dockerfile.template @@ -1,4 +1,4 @@ -FROM debian:bookworm-slim +FROM debian:trixie-slim RUN set -eux; \ apt-get update; \ diff --git a/handbrake/Dockerfile b/handbrake/Dockerfile index 6d331e0038f..a6806d949b3 100644 --- a/handbrake/Dockerfile +++ b/handbrake/Dockerfile @@ -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 diff --git a/handbrake/Dockerfile.template b/handbrake/Dockerfile.template index eddfeab7fc8..02e47d2791c 100644 --- a/handbrake/Dockerfile.template +++ b/handbrake/Dockerfile.template @@ -1,4 +1,4 @@ -FROM debian:bookworm-slim +FROM debian:trixie-slim # https://github.com/HandBrake/HandBrake/releases ENV HANDBRAKE_VERSION {{ .version }} diff --git a/infosiftr-moby/Dockerfile b/infosiftr-moby/Dockerfile index 529c2e2fb0b..0417ac17ad0 100644 --- a/infosiftr-moby/Dockerfile +++ b/infosiftr-moby/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bookworm-slim +FROM debian:trixie-slim RUN set -eux; \ apt-get update; \ @@ -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; \ \ diff --git a/infosiftr-moby/Dockerfile.trixie b/infosiftr-moby/Dockerfile.bookworm similarity index 82% rename from infosiftr-moby/Dockerfile.trixie rename to infosiftr-moby/Dockerfile.bookworm index 342cd352908..32d86b96683 100644 --- a/infosiftr-moby/Dockerfile.trixie +++ b/infosiftr-moby/Dockerfile.bookworm @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:trixie-slim +FROM debian:bookworm-slim RUN set -eux; \ apt-get update; \ @@ -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 trixie 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 bookworm main' > /etc/apt/sources.list.d/moby.list # TODO deb822 -# 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 +# 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 RUN set -eux; \ \ diff --git a/infosiftr-moby/gsl.sh b/infosiftr-moby/gsl.sh index 3402fd11675..0f592b64a31 100755 --- a/infosiftr-moby/gsl.sh +++ b/infosiftr-moby/gsl.sh @@ -9,7 +9,7 @@ version="$(jq -r '.version' "$dir/versions.json")" [ -n "$version" ] from="$(awk '$1 == "FROM" { print $2; exit }' "$dir/Dockerfile")" # TODO multi-stage build?? -arches="$(bashbrew remote arches --json "$from" | jq -c '.arches | keys + ["riscv64"]')" +arches="$(bashbrew remote arches --json "$from" | jq -c '.arches | keys + ["mips64le"]')" archesString="$(jq <<<"$arches" -r 'join(", ")')" [ -n "$archesString" ] @@ -20,7 +20,7 @@ globalEntry echo "Architectures: $archesString" versionedTagsEntry "$dir" "$version" latest -echo 'riscv64-File: Dockerfile.trixie' +echo 'mips64le-File: Dockerfile.bookworm' # add old per-arch tags: https://explore.ggcr.dev/?repo=infosiftr/moby archArr="$(jq <<<"$arches" -r 'map(@sh) | join(" ")')" @@ -28,7 +28,7 @@ eval "archArr=( $archArr )" for arch in "${archArr[@]}"; do tagsEntry "$dir" "$arch" echo "Architectures: $arch" - if [ "$arch" = 'riscv64' ]; then - echo 'riscv64-File: Dockerfile.trixie' + if [ "$arch" = 'mips64le' ]; then + echo 'mips64le-File: Dockerfile.bookworm' fi done diff --git a/infosiftr-moby/versions.json b/infosiftr-moby/versions.json index 8b9c3e19a4a..e13c8f03248 100644 --- a/infosiftr-moby/versions.json +++ b/infosiftr-moby/versions.json @@ -1,67 +1,67 @@ { "debian": { - "version": "bookworm" + "version": "trixie" }, "engine": { - "filename": "pool/bookworm/main/moby-engine/moby-engine_23.0.18-1~deb12u0_amd64.deb", - "sha256": "6c52d7bf4bf46ed222bc4c7de1f435ad5ec64ad6f871f55570d7ca486917e925", - "url": "https://apt.tianon.xyz/moby/pool/bookworm/main/moby-engine/moby-engine_23.0.18-1~deb12u0_amd64.deb", - "version": "23.0.18-1~deb12u0" + "filename": "pool/trixie/main/moby-engine/moby-engine_23.0.18-1~deb13u0_amd64.deb", + "sha256": "ade36627949d99f3fcd76b0020104360049d59cbc965ea8c7ca4c3bc55036afa", + "url": "https://apt.tianon.xyz/moby/pool/trixie/main/moby-engine/moby-engine_23.0.18-1~deb13u0_amd64.deb", + "version": "23.0.18-1~deb13u0" }, "containerd": { - "filename": "pool/bookworm/main/moby-containerd/moby-containerd_1.6.38-1~deb12u0_amd64.deb", - "sha256": "d4949f851911b0991610e7b9f7985d8b4e31799e2be923dd6ea6a77c77cb93e4", - "url": "https://apt.tianon.xyz/moby/pool/bookworm/main/moby-containerd/moby-containerd_1.6.38-1~deb12u0_amd64.deb", - "version": "1.6.38-1~deb12u0" + "filename": "pool/trixie/main/moby-containerd/moby-containerd_1.6.38-1~deb13u0_amd64.deb", + "sha256": "82c91e26814b0b6f78d432031d651f5875062ea1ccc107098219ff7c747cf0a9", + "url": "https://apt.tianon.xyz/moby/pool/trixie/main/moby-containerd/moby-containerd_1.6.38-1~deb13u0_amd64.deb", + "version": "1.6.38-1~deb13u0" }, "runc": { - "filename": "pool/bookworm/main/moby-runc/moby-runc_1.1.15-2~deb12u0_amd64.deb", - "sha256": "c48ebbede850dab06431ebabd96f78b779edb00e0e24d3e901494c9b77234c07", - "url": "https://apt.tianon.xyz/moby/pool/bookworm/main/moby-runc/moby-runc_1.1.15-2~deb12u0_amd64.deb", - "version": "1.1.15-2~deb12u0" + "filename": "pool/trixie/main/moby-runc/moby-runc_1.1.15-2~deb13u0_amd64.deb", + "sha256": "ac1fdbbee8247e566f339090a19fcf07b9b5c83e1aadd3c8eed5f255d3857a6b", + "url": "https://apt.tianon.xyz/moby/pool/trixie/main/moby-runc/moby-runc_1.1.15-2~deb13u0_amd64.deb", + "version": "1.1.15-2~deb13u0" }, "cli": { - "filename": "pool/bookworm/main/moby-cli/moby-cli_23.0.15-2~deb12u0_amd64.deb", - "sha256": "622cef9c6cdc6e080a6d858df516e76f6cb947c1d4fea75bc588cc7dae1d0320", - "url": "https://apt.tianon.xyz/moby/pool/bookworm/main/moby-cli/moby-cli_23.0.15-2~deb12u0_amd64.deb", - "version": "23.0.15-2~deb12u0" + "filename": "pool/trixie/main/moby-cli/moby-cli_23.0.15-2~deb13u0_amd64.deb", + "sha256": "e5a9cfb0bdfe00b328cbb359c06d346ba67c084ec1d5b882af770ca303e36efe", + "url": "https://apt.tianon.xyz/moby/pool/trixie/main/moby-cli/moby-cli_23.0.15-2~deb13u0_amd64.deb", + "version": "23.0.15-2~deb13u0" }, "cli-plugin-buildx": { - "filename": "pool/bookworm/main/moby-buildx/moby-cli-plugin-buildx_0.17.1-2~deb12u0_amd64.deb", - "sha256": "140908d662f3d3463656917cd8f32706e860593929c55f0d5e95a85f42abf4f0", - "url": "https://apt.tianon.xyz/moby/pool/bookworm/main/moby-buildx/moby-cli-plugin-buildx_0.17.1-2~deb12u0_amd64.deb", - "version": "0.17.1-2~deb12u0" + "filename": "pool/trixie/main/moby-buildx/moby-cli-plugin-buildx_0.17.1-2~deb13u0_amd64.deb", + "sha256": "9720d6823646ceb24557d7581f2183e5985d0fc316f2a7c5ad0150b7d434284e", + "url": "https://apt.tianon.xyz/moby/pool/trixie/main/moby-buildx/moby-cli-plugin-buildx_0.17.1-2~deb13u0_amd64.deb", + "version": "0.17.1-2~deb13u0" }, - "trixie": { + "bookworm": { "engine": { - "filename": "pool/trixie/main/moby-engine/moby-engine_23.0.18-1~deb13u0_riscv64.deb", - "sha256": "39549c6bccbd62ed60f736974b20804e53c922dc5e7a9c5bf1c90cd0cd672ea6", - "url": "https://apt.tianon.xyz/moby/pool/trixie/main/moby-engine/moby-engine_23.0.18-1~deb13u0_riscv64.deb", - "version": "23.0.18-1~deb13u0" + "filename": "pool/bookworm/main/moby-engine/moby-engine_23.0.18-1~deb12u0_mips64el.deb", + "sha256": "9363e1e07e0970d767b8c1d46d16563e9421fac615c9a14db84e1b5bcffa0f54", + "url": "https://apt.tianon.xyz/moby/pool/bookworm/main/moby-engine/moby-engine_23.0.18-1~deb12u0_mips64el.deb", + "version": "23.0.18-1~deb12u0" }, "containerd": { - "filename": "pool/trixie/main/moby-containerd/moby-containerd_1.6.38-1~deb13u0_riscv64.deb", - "sha256": "42e8ab48e8cf95bc8f7208790450db436f7fa3d7d7873beb94a6fb6c0fcdf599", - "url": "https://apt.tianon.xyz/moby/pool/trixie/main/moby-containerd/moby-containerd_1.6.38-1~deb13u0_riscv64.deb", - "version": "1.6.38-1~deb13u0" + "filename": "pool/bookworm/main/moby-containerd/moby-containerd_1.6.38-1~deb12u0_mips64el.deb", + "sha256": "b6f5da4b96d4bf024950ccc7166c028d9b26e8f604d26df58f90ac172dd0758b", + "url": "https://apt.tianon.xyz/moby/pool/bookworm/main/moby-containerd/moby-containerd_1.6.38-1~deb12u0_mips64el.deb", + "version": "1.6.38-1~deb12u0" }, "runc": { - "filename": "pool/trixie/main/moby-runc/moby-runc_1.1.15-2~deb13u0_riscv64.deb", - "sha256": "d73dafaff524297a585cc02c3894a9c4b23a0b7e682a0bd261cd6270661c3bf6", - "url": "https://apt.tianon.xyz/moby/pool/trixie/main/moby-runc/moby-runc_1.1.15-2~deb13u0_riscv64.deb", - "version": "1.1.15-2~deb13u0" + "filename": "pool/bookworm/main/moby-runc/moby-runc_1.1.15-2~deb12u0_mips64el.deb", + "sha256": "0c17dce063f1857bcc8b02555adea62ab242aebd9f8af7cbeb6315bd1a8eaf9d", + "url": "https://apt.tianon.xyz/moby/pool/bookworm/main/moby-runc/moby-runc_1.1.15-2~deb12u0_mips64el.deb", + "version": "1.1.15-2~deb12u0" }, "cli": { - "filename": "pool/trixie/main/moby-cli/moby-cli_23.0.15-2~deb13u0_riscv64.deb", - "sha256": "1980a3d9637d2be59834bcf2a2975b0fffe677f9303404c5d30b7890234a7243", - "url": "https://apt.tianon.xyz/moby/pool/trixie/main/moby-cli/moby-cli_23.0.15-2~deb13u0_riscv64.deb", - "version": "23.0.15-2~deb13u0" + "filename": "pool/bookworm/main/moby-cli/moby-cli_23.0.15-2~deb12u0_mips64el.deb", + "sha256": "c70b0399be7d698f51ddb55db1bb7d6fef91b8c925ba7c2041d06da63fdc1ba9", + "url": "https://apt.tianon.xyz/moby/pool/bookworm/main/moby-cli/moby-cli_23.0.15-2~deb12u0_mips64el.deb", + "version": "23.0.15-2~deb12u0" }, "cli-plugin-buildx": { - "filename": "pool/trixie/main/moby-buildx/moby-cli-plugin-buildx_0.17.1-2~deb13u0_riscv64.deb", - "sha256": "378640574c6800f2ac1c19580529de2c10d407a3dffae65a670260aa48918f5f", - "url": "https://apt.tianon.xyz/moby/pool/trixie/main/moby-buildx/moby-cli-plugin-buildx_0.17.1-2~deb13u0_riscv64.deb", - "version": "0.17.1-2~deb13u0" + "filename": "pool/bookworm/main/moby-buildx/moby-cli-plugin-buildx_0.17.1-2~deb12u0_mips64el.deb", + "sha256": "4d7e6e55f38ae322c917ef88520a0bbe87843a86439a29e94a2f1f570b9e2f88", + "url": "https://apt.tianon.xyz/moby/pool/bookworm/main/moby-buildx/moby-cli-plugin-buildx_0.17.1-2~deb12u0_mips64el.deb", + "version": "0.17.1-2~deb12u0" } }, "dind": { @@ -72,6 +72,6 @@ "version": "23.0.18", "variants": [ "", - "trixie" + "bookworm" ] } diff --git a/infosiftr-moby/versions.sh b/infosiftr-moby/versions.sh index d4a3bbd704e..9c88102f5ab 100755 --- a/infosiftr-moby/versions.sh +++ b/infosiftr-moby/versions.sh @@ -8,7 +8,7 @@ dir="$(dirname "$dir")" source "$dir/../.libs/deb-repo.sh" source "$dir/../.libs/git.sh" -debian='bookworm' +debian='trixie' json="$(jq -nc --arg debian "$debian" '{ debian: { version: $debian } }')" uri='https://apt.tianon.xyz/moby' @@ -16,7 +16,7 @@ component='main' for suite in \ "$debian" \ - trixie \ + bookworm \ ; do for binpkg in \ engine \ @@ -27,14 +27,14 @@ for suite in \ ; do cjson="$( package="moby-$binpkg" - if [ "$suite" = 'trixie' ]; then - arch='riscv64' + if [ "$suite" = 'bookworm' ]; then + arch='mips64el' fi deb-repo )" json="$(jq <<<"$json" -c --arg suite "$suite" --arg binpkg "$binpkg" --argjson cjson "$cjson" ' - if $suite == "trixie" then - .["trixie"][$binpkg] = $cjson + if $suite == "bookworm" then + .["bookworm"][$binpkg] = $cjson else .[$binpkg] = $cjson end @@ -57,10 +57,10 @@ jq <<<"$json" --argjson dind "$dind" ' .dind = $dind | (.engine.version | upstream_version) as $eng | (.cli.version | upstream_version) as $cli - | (.trixie.engine.version | upstream_version) as $ueng - | (.trixie.cli.version | upstream_version) as $ucli + | (.bookworm.engine.version | upstream_version) as $ueng + | (.bookworm.cli.version | upstream_version) as $ucli | if v($eng) >= v($cli) and $eng == $ueng and v($eng) >= v($ucli) then .version = $eng else . end - | .variants = [ "", "trixie" ] # make sure "apply-templates.sh" creates "Dockerfile.trixie" too + | .variants = [ "", "bookworm" ] # make sure "apply-templates.sh" creates "Dockerfile.bookworm" too ' > versions.json diff --git a/jenkins/Dockerfile.template b/jenkins/Dockerfile.template index dea85e36c5c..b899558e43e 100644 --- a/jenkins/Dockerfile.template +++ b/jenkins/Dockerfile.template @@ -1,4 +1,4 @@ -FROM debian:bookworm-slim +FROM debian:trixie-slim RUN set -eux; \ apt-get update; \ diff --git a/jenkins/lts/Dockerfile b/jenkins/lts/Dockerfile index bf2f9a894a6..20bb9422a33 100644 --- a/jenkins/lts/Dockerfile +++ b/jenkins/lts/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bookworm-slim +FROM debian:trixie-slim RUN set -eux; \ apt-get update; \ diff --git a/jenkins/weekly/Dockerfile b/jenkins/weekly/Dockerfile index 0404d7db06b..91f27e29236 100644 --- a/jenkins/weekly/Dockerfile +++ b/jenkins/weekly/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bookworm-slim +FROM debian:trixie-slim RUN set -eux; \ apt-get update; \ diff --git a/makemkv/Dockerfile b/makemkv/Dockerfile index d0a163dd94c..f58ee127edf 100644 --- a/makemkv/Dockerfile +++ b/makemkv/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bookworm-slim +FROM debian:trixie-slim # This disc requires Java runtime (JRE), but none was found. Certain functions will fail, please install Java. See http://www.makemkv.com/bdjava/ for details. RUN set -eux; \ diff --git a/makemkv/Dockerfile.template b/makemkv/Dockerfile.template index df7a7a4f48e..9e8c31d56c9 100644 --- a/makemkv/Dockerfile.template +++ b/makemkv/Dockerfile.template @@ -1,4 +1,4 @@ -FROM debian:bookworm-slim +FROM debian:trixie-slim # This disc requires Java runtime (JRE), but none was found. Certain functions will fail, please install Java. See http://www.makemkv.com/bdjava/ for details. RUN set -eux; \ diff --git a/microsoft-edge/Dockerfile.template b/microsoft-edge/Dockerfile.template index b96ddd4935b..b16fda24c71 100644 --- a/microsoft-edge/Dockerfile.template +++ b/microsoft-edge/Dockerfile.template @@ -2,7 +2,7 @@ def channel: # "stable", "beta", "dev" env.dir | split("/")[-1] -}} -FROM debian:bookworm-slim +FROM debian:trixie-slim RUN set -eux; \ apt-get update; \ diff --git a/microsoft-edge/beta/Dockerfile b/microsoft-edge/beta/Dockerfile index 203430a03aa..1094835a85c 100644 --- a/microsoft-edge/beta/Dockerfile +++ b/microsoft-edge/beta/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bookworm-slim +FROM debian:trixie-slim RUN set -eux; \ apt-get update; \ diff --git a/microsoft-edge/dev/Dockerfile b/microsoft-edge/dev/Dockerfile index 36a4e2fc707..9f38e144d7a 100644 --- a/microsoft-edge/dev/Dockerfile +++ b/microsoft-edge/dev/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bookworm-slim +FROM debian:trixie-slim RUN set -eux; \ apt-get update; \ diff --git a/microsoft-edge/stable/Dockerfile b/microsoft-edge/stable/Dockerfile index aff1a5ac031..e0700397da8 100644 --- a/microsoft-edge/stable/Dockerfile +++ b/microsoft-edge/stable/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bookworm-slim +FROM debian:trixie-slim RUN set -eux; \ apt-get update; \ diff --git a/mutt-gmail/Dockerfile b/mutt-gmail/Dockerfile index 1b265fddfb4..d86624d0e6e 100644 --- a/mutt-gmail/Dockerfile +++ b/mutt-gmail/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bookworm-slim +FROM debian:trixie-slim RUN groupadd -g 1000 user \ && useradd --create-home -d /home/user -g user -u 1000 user diff --git a/network-toolbox/debian/Dockerfile b/network-toolbox/debian/Dockerfile index b5f76d359a2..cbe80eaf794 100644 --- a/network-toolbox/debian/Dockerfile +++ b/network-toolbox/debian/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bookworm-slim +FROM debian:trixie-slim RUN set -eux; \ # dangit, wireshark-common! *shakes fist* @@ -26,7 +26,7 @@ RUN set -eux; \ netcat-openbsd \ nftables \ nmap \ - ntpdate \ + ntpsec-ntpdate \ openssh-client \ procps \ rsync \ diff --git a/nolibc/Dockerfile b/nolibc/Dockerfile index 27f9f50b6f1..b87d6e4f594 100644 --- a/nolibc/Dockerfile +++ b/nolibc/Dockerfile @@ -8,7 +8,7 @@ # https://github.com/wtarreau/nolibc # https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/tools/include/nolibc?h=linux-rolling-stable -FROM debian:bookworm-slim +FROM debian:trixie-slim RUN set -eux; \ apt-get update; \ diff --git a/nolibc/Dockerfile.template b/nolibc/Dockerfile.template index 3db33d2afae..46277fbd6d4 100644 --- a/nolibc/Dockerfile.template +++ b/nolibc/Dockerfile.template @@ -2,7 +2,7 @@ # https://github.com/wtarreau/nolibc # https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/tools/include/nolibc?h=linux-rolling-stable -FROM debian:bookworm-slim +FROM debian:trixie-slim RUN set -eux; \ apt-get update; \ diff --git a/plex/media-server/Dockerfile b/plex/media-server/Dockerfile index c04ef80998f..44dec9c4496 100644 --- a/plex/media-server/Dockerfile +++ b/plex/media-server/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bookworm-slim +FROM debian:trixie-slim RUN set -eux; \ apt-get update; \ diff --git a/plex/media-server/Dockerfile.template b/plex/media-server/Dockerfile.template index d0f35224df9..372f7db28d2 100644 --- a/plex/media-server/Dockerfile.template +++ b/plex/media-server/Dockerfile.template @@ -1,4 +1,4 @@ -FROM debian:bookworm-slim +FROM debian:trixie-slim RUN set -eux; \ apt-get update; \ diff --git a/prometheus/node-exporter/Dockerfile b/prometheus/node-exporter/Dockerfile index 64e7a5a09cd..61b2bfa0950 100644 --- a/prometheus/node-exporter/Dockerfile +++ b/prometheus/node-exporter/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bookworm-slim +FROM debian:trixie-slim WORKDIR /opt/node-exporter ENV PATH /opt/node-exporter:$PATH diff --git a/prometheus/node-exporter/Dockerfile.template b/prometheus/node-exporter/Dockerfile.template index c046241db06..9426521fe4e 100644 --- a/prometheus/node-exporter/Dockerfile.template +++ b/prometheus/node-exporter/Dockerfile.template @@ -1,4 +1,4 @@ -FROM debian:bookworm-slim +FROM debian:trixie-slim WORKDIR /opt/node-exporter ENV PATH /opt/node-exporter:$PATH diff --git a/rtl-433/Dockerfile b/rtl-433/Dockerfile index ae58fcd7531..879ed60dfb8 100644 --- a/rtl-433/Dockerfile +++ b/rtl-433/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bookworm-slim +FROM debian:trixie-slim RUN set -eux; \ apt-get update; \ diff --git a/rtl-433/Dockerfile.template b/rtl-433/Dockerfile.template index 8ea77786b57..1d52d3637a0 100644 --- a/rtl-433/Dockerfile.template +++ b/rtl-433/Dockerfile.template @@ -1,4 +1,4 @@ -FROM debian:bookworm-slim +FROM debian:trixie-slim RUN set -eux; \ apt-get update; \ diff --git a/rtorrent/Dockerfile b/rtorrent/Dockerfile index 6a7aaf5d290..f95e1fc8a33 100644 --- a/rtorrent/Dockerfile +++ b/rtorrent/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bookworm-slim +FROM debian:trixie-slim RUN useradd --create-home user diff --git a/signal-desktop/Dockerfile b/signal-desktop/Dockerfile index 3f7050c339c..74284cdef3c 100644 --- a/signal-desktop/Dockerfile +++ b/signal-desktop/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bookworm-slim +FROM debian:trixie-slim RUN set -eux; \ apt-get update; \ diff --git a/signal-desktop/Dockerfile.template b/signal-desktop/Dockerfile.template index 2d146275cda..5ab55d99921 100644 --- a/signal-desktop/Dockerfile.template +++ b/signal-desktop/Dockerfile.template @@ -1,4 +1,4 @@ -FROM debian:bookworm-slim +FROM debian:trixie-slim RUN set -eux; \ apt-get update; \ diff --git a/tailscale/Dockerfile b/tailscale/Dockerfile index c851912510e..0b1138d33a8 100644 --- a/tailscale/Dockerfile +++ b/tailscale/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bookworm-slim +FROM debian:trixie-slim RUN set -eux; \ apt-get update; \ diff --git a/tailscale/Dockerfile.template b/tailscale/Dockerfile.template index dbb2116b645..47f6975039a 100644 --- a/tailscale/Dockerfile.template +++ b/tailscale/Dockerfile.template @@ -1,4 +1,4 @@ -FROM debian:bookworm-slim +FROM debian:trixie-slim RUN set -eux; \ apt-get update; \ diff --git a/tinygo/Dockerfile b/tinygo/Dockerfile index 4f59ee6ff07..94cf5b870c4 100644 --- a/tinygo/Dockerfile +++ b/tinygo/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM golang:1.24-bookworm +FROM golang:1.24-trixie # the .deb (as of 0.6.0) installs to /usr/local/tinygo but doesn't add "tinygo" to PATH ENV PATH /usr/local/tinygo/bin:$PATH diff --git a/tinygo/Dockerfile.template b/tinygo/Dockerfile.template index e05d9476a79..ccaaa8c2f5e 100644 --- a/tinygo/Dockerfile.template +++ b/tinygo/Dockerfile.template @@ -1,4 +1,4 @@ -FROM golang:{{ .go.max.version }}-bookworm +FROM golang:{{ .go.max.version }}-trixie # the .deb (as of 0.6.0) installs to /usr/local/tinygo but doesn't add "tinygo" to PATH ENV PATH /usr/local/tinygo/bin:$PATH diff --git a/true/Dockerfile.all b/true/Dockerfile.all index 242d227fa2b..f5c6cea97ec 100644 --- a/true/Dockerfile.all +++ b/true/Dockerfile.all @@ -1,4 +1,4 @@ -FROM debian:bookworm-slim AS base +FROM debian:trixie-slim AS base RUN apt-get update && apt-get install -y --no-install-recommends make && rm -rf /var/lib/apt/lists/* WORKDIR /true COPY Makefile true*.* ./ diff --git a/weechat/Dockerfile b/weechat/Dockerfile index 90f4dc0bfd7..558cde5f010 100644 --- a/weechat/Dockerfile +++ b/weechat/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bookworm-slim +FROM debian:trixie-slim RUN set -eux; \ apt-get update; \ @@ -45,7 +45,7 @@ RUN set -eux; \ rm -rf /var/lib/apt/lists/* # https://weechat.org/download/stable/ -# https://weechat.org/download/debian/active/#debian_bookworm +# https://weechat.org/download/debian/active/#debian_trixie ENV WEECHAT_VERSION 4.7.0-1 RUN set -eux; \ diff --git a/weechat/Dockerfile.template b/weechat/Dockerfile.template index afdc24aea28..adedd4ab8ba 100644 --- a/weechat/Dockerfile.template +++ b/weechat/Dockerfile.template @@ -1,4 +1,4 @@ -FROM debian:bookworm-slim +FROM debian:trixie-slim RUN set -eux; \ apt-get update; \ @@ -39,7 +39,7 @@ RUN set -eux; \ rm -rf /var/lib/apt/lists/* # https://weechat.org/download/stable/ -# https://weechat.org/download/debian/active/#debian_bookworm +# https://weechat.org/download/debian/active/#debian_trixie ENV WEECHAT_VERSION {{ .version }} RUN set -eux; \ diff --git a/weechat/versions.json b/weechat/versions.json index 7c578a342e9..df578df5b0f 100644 --- a/weechat/versions.json +++ b/weechat/versions.json @@ -1,6 +1,6 @@ { - "filename": "dists/oldstable/main/binary-amd64/weechat_4.7.0-1_all.deb", - "sha256": "4481bf21810f93397cc699fe92673ea013b4b9da2b95559237811aeee75c4be5", - "url": "https://weechat.org/debian/dists/oldstable/main/binary-amd64/weechat_4.7.0-1_all.deb", + "filename": "dists/stable/main/binary-amd64/weechat_4.7.0-1_all.deb", + "sha256": "39d4849bdd1a433be198bfac79d62290851cb0f710d4c3a2db0f534b5dc498e2", + "url": "https://weechat.org/debian/dists/stable/main/binary-amd64/weechat_4.7.0-1_all.deb", "version": "4.7.0-1" } diff --git a/wine/Dockerfile b/wine/Dockerfile index 9cc66a67841..b7f2c7e1788 100644 --- a/wine/Dockerfile +++ b/wine/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bookworm-slim +FROM debian:trixie-slim # https://wiki.winehq.org/Debian @@ -13,14 +13,12 @@ RUN set -eux; \ apt-get install -y --no-install-recommends apt-transport-https ca-certificates; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get install -y --no-install-recommends gnupg; \ - rm -rf /var/lib/apt/lists/*; \ \ export GNUPGHOME="$(mktemp -d)"; \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys D43F640145369C51D786DDEA76F1A20FF987672F; \ - gpg --batch --export --armor D43F640145369C51D786DDEA76F1A20FF987672F > /etc/apt/trusted.gpg.d/winehq.gpg.asc; \ + gpg --batch --export --armor D43F640145369C51D786DDEA76F1A20FF987672F > /etc/apt/keyrings/winehq.asc; \ gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ - apt-key list | grep 'WineHQ'; \ \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark > /dev/null; \ @@ -28,12 +26,14 @@ RUN set -eux; \ \ dpkg --add-architecture i386; \ suite="$(awk '$1 == "Suites:" { print $2; exit }' /etc/apt/sources.list.d/debian.sources)"; \ - echo "deb https://dl.winehq.org/wine-builds/debian $suite main" > /etc/apt/sources.list.d/winehq.list + echo "deb [ signed-by=/etc/apt/keyrings/winehq.asc ] https://dl.winehq.org/wine-builds/debian $suite main" > /etc/apt/sources.list.d/winehq.list; \ + apt-get update; \ + apt-get dist-clean -# https://dl.winehq.org/wine-builds/debian/dists/bookworm/main/binary-amd64/?C=N;O=D +# https://dl.winehq.org/wine-builds/debian/dists/trixie/main/binary-amd64/?C=N;O=D # https://www.winehq.org/news/ ENV WINE_VERSION 10.0.0.0 -ENV WINE_DEB_VERSION 10.0.0.0~bookworm-1 +ENV WINE_DEB_VERSION 10.0.0.0~trixie-1 RUN set -eux; \ { \ @@ -41,9 +41,8 @@ RUN set -eux; \ echo "Pin: version $WINE_DEB_VERSION"; \ echo 'Pin-Priority: 1001'; \ } > /etc/apt/preferences.d/winehq.pref; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ + apt-get install --update -y --no-install-recommends \ "winehq-stable=$WINE_DEB_VERSION" \ ; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ wine --version diff --git a/wine/Dockerfile.template b/wine/Dockerfile.template index 22fe65e6d38..06e6d00ebea 100644 --- a/wine/Dockerfile.template +++ b/wine/Dockerfile.template @@ -1,4 +1,4 @@ -FROM debian:bookworm-slim +FROM debian:trixie-slim # https://wiki.winehq.org/Debian @@ -7,14 +7,12 @@ RUN set -eux; \ apt-get install -y --no-install-recommends apt-transport-https ca-certificates; \ savedAptMark="$(apt-mark showmanual)"; \ apt-get install -y --no-install-recommends gnupg; \ - rm -rf /var/lib/apt/lists/*; \ \ export GNUPGHOME="$(mktemp -d)"; \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys D43F640145369C51D786DDEA76F1A20FF987672F; \ - gpg --batch --export --armor D43F640145369C51D786DDEA76F1A20FF987672F > /etc/apt/trusted.gpg.d/winehq.gpg.asc; \ + gpg --batch --export --armor D43F640145369C51D786DDEA76F1A20FF987672F > /etc/apt/keyrings/winehq.asc; \ gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ - apt-key list | grep 'WineHQ'; \ \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark > /dev/null; \ @@ -22,9 +20,11 @@ RUN set -eux; \ \ dpkg --add-architecture i386; \ suite="$(awk '$1 == "Suites:" { print $2; exit }' /etc/apt/sources.list.d/debian.sources)"; \ - echo "deb https://dl.winehq.org/wine-builds/debian $suite main" > /etc/apt/sources.list.d/winehq.list + echo "deb [ signed-by=/etc/apt/keyrings/winehq.asc ] https://dl.winehq.org/wine-builds/debian $suite main" > /etc/apt/sources.list.d/winehq.list; \ + apt-get update; \ + apt-get dist-clean -# https://dl.winehq.org/wine-builds/debian/dists/bookworm/main/binary-amd64/?C=N;O=D +# https://dl.winehq.org/wine-builds/debian/dists/trixie/main/binary-amd64/?C=N;O=D # https://www.winehq.org/news/ ENV WINE_VERSION {{ .version }} ENV WINE_DEB_VERSION {{ .debian.version }} @@ -35,9 +35,8 @@ RUN set -eux; \ echo "Pin: version $WINE_DEB_VERSION"; \ echo 'Pin-Priority: 1001'; \ } > /etc/apt/preferences.d/winehq.pref; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ + apt-get install --update -y --no-install-recommends \ "winehq-stable=$WINE_DEB_VERSION" \ ; \ - rm -rf /var/lib/apt/lists/*; \ + apt-get dist-clean; \ wine --version diff --git a/wine/versions.json b/wine/versions.json index b1f69625cdf..2950edffcf3 100644 --- a/wine/versions.json +++ b/wine/versions.json @@ -1,9 +1,9 @@ { "version": "10.0.0.0", "debian": { - "filename": "pool/main/w/wine/winehq-stable_10.0.0.0~bookworm-1_amd64.deb", - "sha256": "8afd962bee42616224c835b2af53b7beb618f92c7fbfe699da3f1976a0601731", - "url": "https://dl.winehq.org/wine-builds/debian/pool/main/w/wine/winehq-stable_10.0.0.0~bookworm-1_amd64.deb", - "version": "10.0.0.0~bookworm-1" + "filename": "pool/main/w/wine/winehq-stable_10.0.0.0~trixie-1_amd64.deb", + "sha256": "4c1a4e0db2217ad7443126ac39276bee80de1e7905faeee3b2cb1b1e28cc4eca", + "url": "https://dl.winehq.org/wine-builds/debian/pool/main/w/wine/winehq-stable_10.0.0.0~trixie-1_amd64.deb", + "version": "10.0.0.0~trixie-1" } } diff --git a/zoom/Dockerfile b/zoom/Dockerfile index 542662da4f6..9ec9a3641f0 100644 --- a/zoom/Dockerfile +++ b/zoom/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bookworm-slim +FROM debian:trixie-slim RUN set -eux; \ apt-get update; \ diff --git a/zoom/Dockerfile.template b/zoom/Dockerfile.template index 6c6c85c717c..88e9fa05f9e 100644 --- a/zoom/Dockerfile.template +++ b/zoom/Dockerfile.template @@ -1,4 +1,4 @@ -FROM debian:bookworm-slim +FROM debian:trixie-slim RUN set -eux; \ apt-get update; \