diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml index 8ee55a61..dad22e41 100644 --- a/.github/workflows/dependencies.yml +++ b/.github/workflows/dependencies.yml @@ -48,7 +48,7 @@ jobs: images: ${{ env.DOCKER_IMAGE }} # Docker tags based on the following events/attributes tags: | - type=raw,value=latest + type=raw,value=trixie type=sha - name: Detect dependency versions diff --git a/dependencies/Dockerfile b/dependencies/Dockerfile index dba671eb..76115085 100644 --- a/dependencies/Dockerfile +++ b/dependencies/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=${BUILDPLATFORM:-linux/amd64} debian:bookworm-slim AS base-prep +FROM --platform=${BUILDPLATFORM:-linux/amd64} debian:trixie-slim AS base-prep ARG TARGETPLATFORM SHELL ["/bin/bash", "-euo", "pipefail", "-c"] COPY --chmod=0755 prepare.sh /tmp/ @@ -65,5 +65,5 @@ COPY --from=download-jellyfin-ffmpeg /output/ /output/ COPY --chmod=0755 output.sh / RUN /output.sh -FROM debian:bookworm-slim AS release +FROM debian:trixie-slim AS release COPY --from=final-assembly /artifacts.tar.gz / diff --git a/dependencies/download_jellyfin-ffmpeg.sh b/dependencies/download_jellyfin-ffmpeg.sh index 39a9fd57..ca59dcbc 100755 --- a/dependencies/download_jellyfin-ffmpeg.sh +++ b/dependencies/download_jellyfin-ffmpeg.sh @@ -29,7 +29,7 @@ echo Compiler: "${DEB_HOST_GNU_TYPE}" Arch: "${DEB_HOST_ARCH}" VER="${JELLYFIN_FFMPEG_VERSION#v}" MAJOR_VER=$(echo "${VER}" | cut -d. -f1) -URL="https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/${JELLYFIN_FFMPEG_VERSION}/jellyfin-ffmpeg${MAJOR_VER}_${VER}-bookworm_${DEB_HOST_ARCH}.deb" +URL="https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/${JELLYFIN_FFMPEG_VERSION}/jellyfin-ffmpeg${MAJOR_VER}_${VER}-trixie_${DEB_HOST_ARCH}.deb" echo download jellyfin-ffmpeg from "$URL" mkdir -p /output/deb curl -fsSL --retry 2 --retry-delay 5 --retry-max-time 60 -o /output/deb/jellyfin-ffmpeg.deb "$URL" diff --git a/dependencies/prepare.sh b/dependencies/prepare.sh index 5d0cec18..cbaef78f 100755 --- a/dependencies/prepare.sh +++ b/dependencies/prepare.sh @@ -18,6 +18,7 @@ apt-get install -y \ ca-certificates \ crossbuild-essential-"${DEBIAN_ARCH}" \ libc-dev:"${DEBIAN_ARCH}" \ + dpkg-dev \ autoconf \ automake \ libtool \