Revert "Merge pull request #32 from Shadowghost/cleanup"

This reverts commit c9180ac, reversing
changes made to f8b81fe.

Too much for point release, regret the merge. Will revert the revert for
10.9.0

Dockerfile.amd64

@@ -1,12 +1,9 @@
 # By default build for stable; unstable must set this explicitly
 ARG TARGET_RELEASE=stable
-ARG DISTRO=debian
-ARG CODENAME=bookworm
-ARG ARCH=amd64
 
-FROM jellyfin/jellyfin-server:${TARGET_RELEASE}-${ARCH} as server
+FROM jellyfin/jellyfin-server:${TARGET_RELEASE}-amd64 as server
 FROM jellyfin/jellyfin-web:${TARGET_RELEASE} as web
-FROM debian:${CODENAME}-slim
+FROM debian:bullseye-slim
 
 ENV HEALTHCHECK_URL=http://localhost:8096/health
 
@@ -38,16 +35,12 @@ ARG LEVEL_ZERO_VERSION=1.3.26918.9
 # Install dependencies:
 # curl: healthcheck
 RUN apt-get update \
- && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates gnupg curl wget
-COPY jellyfin.sources /etc/apt/sources.list.d/jellyfin.sources
-RUN mkdir /etc/apt/keyrings \
- && curl -fsSL https://repo.jellyfin.org/jellyfin_team.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/jellyfin.gpg \
- && sed -i -e "s/DISTRO/$DISTRO/" /etc/apt/sources.list.d/jellyfin.sources \
- && sed -i -e "s/CODENAME/$CODENAME/" /etc/apt/sources.list.d/jellyfin.sources \
- && sed -i -e "s/ARCH/$ARCH/" /etc/apt/sources.list.d/jellyfin.sources \
- && cat /etc/apt/sources.list.d/jellyfin.sources \
+ && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates gnupg curl wget apt-transport-https \
+ && curl -fsSL https://repo.jellyfin.org/jellyfin_team.gpg.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/debian-jellyfin.gpg \
+ && echo 'deb [arch=amd64] https://repo.jellyfin.org/debian bullseye main' > /etc/apt/sources.list.d/jellyfin.list \
+ && cat /etc/apt/sources.list.d/jellyfin.list \
  && apt-get update \
- && apt-get install --no-install-recommends --no-install-suggests -y jellyfin-ffmpeg6 openssl locales libfontconfig1 libfreetype6 \
+ && apt-get install --no-install-recommends --no-install-suggests -y jellyfin-ffmpeg5 openssl locales libfontconfig1 libfreetype6 \
 # Intel VAAPI Tone mapping dependencies:
 # Prefer NEO to Beignet since the latter one doesn't support Comet Lake or newer for now.
 # Do not use the intel-opencl-icd package from repo since they will not build with RELEASE_WITH_REGKEYS enabled.

Dockerfile.arm64

@@ -1,13 +1,10 @@
 # By default build for stable; unstable must set this explicitly
 ARG TARGET_RELEASE=stable
-ARG DISTRO=debian
-ARG CODENAME=bookworm
-ARG ARCH=arm64
 
 FROM multiarch/qemu-user-static:x86_64-aarch64 as qemu
-FROM jellyfin/jellyfin-server:${TARGET_RELEASE}-${ARCH} as server
+FROM jellyfin/jellyfin-server:${TARGET_RELEASE}-arm64 as server
 FROM jellyfin/jellyfin-web:${TARGET_RELEASE} as web
-FROM arm64v8/debian:${CODENAME}-slim
+FROM arm64v8/debian:bullseye-slim
 COPY --from=qemu /usr/bin/qemu-aarch64-static /usr/bin
 
 ENV HEALTHCHECK_URL=http://localhost:8096/health
@@ -30,16 +27,11 @@ ENV MALLOC_TRIM_THRESHOLD_=131072
 # Install dependencies:
 #   curl: healcheck
 RUN apt-get update \
- && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates gnupg curl wget
-COPY jellyfin.sources /etc/apt/sources.list.d/jellyfin.sources
-RUN mkdir /etc/apt/keyrings \
- && curl -fsSL https://repo.jellyfin.org/jellyfin_team.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/jellyfin.gpg \
- && sed -i -e "s/DISTRO/$DISTRO/" /etc/apt/sources.list.d/jellyfin.sources \
- && sed -i -e "s/CODENAME/$CODENAME/" /etc/apt/sources.list.d/jellyfin.sources \
- && sed -i -e "s/ARCH/$ARCH/" /etc/apt/sources.list.d/jellyfin.sources \
- && cat /etc/apt/sources.list.d/jellyfin.sources \
+ && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates gnupg curl wget \
+ && curl -fsSL https://repo.jellyfin.org/jellyfin_team.gpg.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/debian-jellyfin.gpg \
+ && echo 'deb [arch=arm64] https://repo.jellyfin.org/debian bullseye main' > /etc/apt/sources.list.d/jellyfin.list \
  && apt-get update \
- && apt-get install --no-install-recommends --no-install-suggests -y jellyfin-ffmpeg6 openssl locales libfontconfig1 libfreetype6 \
+ && apt-get install --no-install-recommends --no-install-suggests -y jellyfin-ffmpeg5 openssl locales libfontconfig1 libfreetype6 \
  && apt-get remove gnupg wget -y \
  && apt-get clean autoclean -y \
  && apt-get autoremove -y \

Dockerfile.armhf

@@ -1,13 +1,10 @@
 # By default build for stable; unstable must set this explicitly
 ARG TARGET_RELEASE=stable
-ARG DISTRO=debian
-ARG CODENAME=bookworm
-ARG ARCH=armhf
 
 FROM multiarch/qemu-user-static:x86_64-arm as qemu
-FROM jellyfin/jellyfin-server:${TARGET_RELEASE}-${ARCH} as server
+FROM jellyfin/jellyfin-server:${TARGET_RELEASE}-armhf as server
 FROM jellyfin/jellyfin-web:${TARGET_RELEASE} as web
-FROM arm32v7/debian:${CODENAME}-slim
+FROM arm32v7/debian:bullseye-slim
 COPY --from=qemu /usr/bin/qemu-arm-static /usr/bin
 
 ENV HEALTHCHECK_URL=http://localhost:8096/health
@@ -30,16 +27,11 @@ ENV MALLOC_TRIM_THRESHOLD_=131072
 # Install dependencies:
 #   curl: healthcheck
 RUN apt-get update \
- && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates gnupg curl wget
-COPY jellyfin.sources /etc/apt/sources.list.d/jellyfin.sources
-RUN mkdir /etc/apt/keyrings \
- && curl -fsSL https://repo.jellyfin.org/jellyfin_team.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/jellyfin.gpg \
- && sed -i -e "s/DISTRO/$DISTRO/" /etc/apt/sources.list.d/jellyfin.sources \
- && sed -i -e "s/CODENAME/$CODENAME/" /etc/apt/sources.list.d/jellyfin.sources \
- && sed -i -e "s/ARCH/$ARCH/" /etc/apt/sources.list.d/jellyfin.sources \
- && cat /etc/apt/sources.list.d/jellyfin.sources \
+ && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates gnupg curl wget \
+ && curl -fsSL https://repo.jellyfin.org/jellyfin_team.gpg.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/debian-jellyfin.gpg \
+ && echo 'deb [arch=armhf] https://repo.jellyfin.org/debian bullseye main' > /etc/apt/sources.list.d/jellyfin.list \
  && apt-get update \
- && apt-get install --no-install-recommends --no-install-suggests -y jellyfin-ffmpeg6 openssl locales libfontconfig1 libfreetype6 \
+ && apt-get install --no-install-recommends --no-install-suggests -y jellyfin-ffmpeg5 openssl locales libfontconfig1 libfreetype6 \
  && apt-get remove gnupg wget -y \
  && apt-get clean autoclean -y \
  && apt-get autoremove -y \