From 8a388abc2207911c8d3c2dce122fa85cb97a8838 Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Sun, 3 Dec 2023 17:09:23 -0500
Subject: [PATCH 1/2] switch to ffmpeg6, clean up repo and packages

---
 Dockerfile         | 12 ++++--------
 Dockerfile.aarch64 | 14 +++++---------
 readme-vars.yml    |  1 +
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 02f0453..860f2e3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,9 +15,9 @@ ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility"
 
 RUN \
   echo "**** install jellyfin *****" && \
-  curl -s https://repo.jellyfin.org/ubuntu/jellyfin_team.gpg.key | apt-key add - && \
-  echo 'deb [arch=amd64] https://repo.jellyfin.org/ubuntu jammy main' > /etc/apt/sources.list.d/jellyfin.list && \
-  echo 'deb [arch=amd64] https://repo.jellyfin.org/ubuntu jammy unstable' >> /etc/apt/sources.list.d/jellyfin.list && \
+  curl -fSsL https://repo.jellyfin.org/ubuntu/jellyfin_team.gpg.key | gpg --dearmor | tee /usr/share/keyrings/jellyfin.gpg >/dev/null && \
+  echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/jellyfin.gpg] https://repo.jellyfin.org/ubuntu jammy main' > /etc/apt/sources.list.d/jellyfin.list && \
+  echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/jellyfin.gpg] https://repo.jellyfin.org/ubuntu jammy unstable' >> /etc/apt/sources.list.d/jellyfin.list && \
   if [ -z ${JELLYFIN_RELEASE+x} ]; then \
     JELLYFIN_RELEASE=$(curl -sX GET https://repo.jellyfin.org/ubuntu/dists/jammy/unstable/binary-amd64/Packages |grep -A 7 -m 1 'Package: jellyfin-server' | awk -F ': ' '/Version/{print $2;exit}'); \
   fi && \
@@ -25,11 +25,7 @@ RUN \
   apt-get install -y --no-install-recommends \
     at \
     jellyfin-server=${JELLYFIN_RELEASE} \
-    jellyfin-ffmpeg5 \
-    jellyfin-web \
-    libfontconfig1 \
-    libfreetype6 \
-    libssl3 \
+    jellyfin-ffmpeg6 \
     mesa-va-drivers && \
   echo "**** cleanup ****" && \
   rm -rf \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 8e37418..de3a3af 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -15,9 +15,9 @@ ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility"
 
 RUN \
   echo "**** install jellyfin *****" && \
-  curl -s https://repo.jellyfin.org/ubuntu/jellyfin_team.gpg.key | apt-key add - && \
-  echo 'deb [arch=arm64] https://repo.jellyfin.org/ubuntu jammy main' > /etc/apt/sources.list.d/jellyfin.list && \
-  echo 'deb [arch=arm64] https://repo.jellyfin.org/ubuntu jammy unstable' >> /etc/apt/sources.list.d/jellyfin.list && \
+  curl -s https://repo.jellyfin.org/ubuntu/jellyfin_team.gpg.key | gpg --dearmor | tee /usr/share/keyrings/jellyfin.gpg >/dev/null && \
+  echo 'deb [arch=arm64 signed-by=/usr/share/keyrings/jellyfin.gpg] https://repo.jellyfin.org/ubuntu jammy main' > /etc/apt/sources.list.d/jellyfin.list && \
+  echo 'deb [arch=arm64 signed-by=/usr/share/keyrings/jellyfin.gpg] https://repo.jellyfin.org/ubuntu jammy unstable' >> /etc/apt/sources.list.d/jellyfin.list && \
   if [ -z ${JELLYFIN_RELEASE+x} ]; then \
     JELLYFIN_RELEASE=$(curl -sX GET https://repo.jellyfin.org/ubuntu/dists/jammy/unstable/binary-amd64/Packages |grep -A 7 -m 1 'Package: jellyfin-server' | awk -F ': ' '/Version/{print $2;exit}'); \
   fi && \
@@ -25,14 +25,10 @@ RUN \
   apt-get install -y --no-install-recommends \
     at \
     jellyfin-server=${JELLYFIN_RELEASE} \
-    jellyfin-ffmpeg5 \
-    jellyfin-web \
-    libfontconfig1 \
-    libfreetype6 \
+    jellyfin-ffmpeg6 \
     libomxil-bellagio0 \
     libomxil-bellagio-bin \
-    libraspberrypi0 \
-    libssl3 && \
+    libraspberrypi0 && \
   echo "**** cleanup ****" && \
   rm -rf \
     /tmp/* \
diff --git a/readme-vars.yml b/readme-vars.yml
index c7bc4da..881997e 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -90,6 +90,7 @@ app_setup_block: |
   ```
 # changelog
 changelogs:
+  - {date: "03.12.23:", desc: "Switch nightly to ffmpeg6."}
   - {date: "01.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"}
   - {date: "07.12.22:", desc: "Rebase nightly to Jammy, migrate to s6v3."}
   - {date: "05.01.22:", desc: "Specify Intel iHD driver versions to avoid mismatched libva errors."}

From 77487aa0324fdf0ab150bdab4863ca7fc8fc62f7 Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Sun, 3 Dec 2023 17:23:53 -0500
Subject: [PATCH 2/2] install recommended to get web

---
 Dockerfile         | 2 +-
 Dockerfile.aarch64 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 860f2e3..0e6c46e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,7 +22,7 @@ RUN \
     JELLYFIN_RELEASE=$(curl -sX GET https://repo.jellyfin.org/ubuntu/dists/jammy/unstable/binary-amd64/Packages |grep -A 7 -m 1 'Package: jellyfin-server' | awk -F ': ' '/Version/{print $2;exit}'); \
   fi && \
   apt-get update && \
-  apt-get install -y --no-install-recommends \
+  apt-get install -y \
     at \
     jellyfin-server=${JELLYFIN_RELEASE} \
     jellyfin-ffmpeg6 \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index de3a3af..6c66d8c 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -22,7 +22,7 @@ RUN \
     JELLYFIN_RELEASE=$(curl -sX GET https://repo.jellyfin.org/ubuntu/dists/jammy/unstable/binary-amd64/Packages |grep -A 7 -m 1 'Package: jellyfin-server' | awk -F ': ' '/Version/{print $2;exit}'); \
   fi && \
   apt-get update && \
-  apt-get install -y --no-install-recommends \
+  apt-get install -y \
     at \
     jellyfin-server=${JELLYFIN_RELEASE} \
     jellyfin-ffmpeg6 \