From b9162b70a46fd0f673518682a7790613bb59b944 Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Sun, 23 Apr 2023 18:45:59 +0100
Subject: [PATCH] Fix version check to use correct repo, update dockerfiles

---
 Dockerfile         | 6 ++----
 Dockerfile.aarch64 | 6 ++----
 Dockerfile.armhf   | 6 ++----
 jenkins-vars.yml   | 2 +-
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 87a15c32..a2970e7b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,14 +18,12 @@ RUN \
   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 && \
   if [ -z ${JELLYFIN_RELEASE+x} ]; then \
-    JELLYFIN="jellyfin-server"; \
-  else \
-    JELLYFIN="jellyfin-server=${JELLYFIN_RELEASE}"; \
+    JELLYFIN_RELEASE=$(curl -sX GET https://repo.jellyfin.org/ubuntu/dists/jammy/main/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 \
     at \
-    ${JELLYFIN} \
+    jellyfin-server=${JELLYFIN_RELEASE} \
     jellyfin-ffmpeg5 \
     jellyfin-web \
     libfontconfig1 \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 3cd18044..cb830dc4 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -18,14 +18,12 @@ RUN \
   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 && \
   if [ -z ${JELLYFIN_RELEASE+x} ]; then \
-    JELLYFIN="jellyfin-server"; \
-  else \
-    JELLYFIN="jellyfin-server=${JELLYFIN_RELEASE}"; \
+    JELLYFIN_RELEASE=$(curl -sX GET https://repo.jellyfin.org/ubuntu/dists/jammy/main/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 \
     at \
-    ${JELLYFIN} \
+    jellyfin-server=${JELLYFIN_RELEASE} \
     jellyfin-ffmpeg5 \
     jellyfin-web \
     libfontconfig1 \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 93e92736..ed3d0747 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -18,14 +18,12 @@ RUN \
   curl -s https://repo.jellyfin.org/ubuntu/jellyfin_team.gpg.key | apt-key add - && \
   echo 'deb [arch=armhf] https://repo.jellyfin.org/ubuntu jammy main' > /etc/apt/sources.list.d/jellyfin.list && \
   if [ -z ${JELLYFIN_RELEASE+x} ]; then \
-    JELLYFIN="jellyfin-server"; \
-  else \
-    JELLYFIN="jellyfin-server=${JELLYFIN_RELEASE}"; \
+    JELLYFIN_RELEASE=$(curl -sX GET https://repo.jellyfin.org/ubuntu/dists/jammy/main/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 \
     at \
-    ${JELLYFIN} \
+    jellyfin-server=${JELLYFIN_RELEASE} \
     jellyfin-ffmpeg5 \
     jellyfin-web \
     libfontconfig1 \
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index b1b1c8f5..15407426 100644
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -3,7 +3,7 @@
 # jenkins variables
 project_name: docker-jellyfin
 external_type: na
-custom_version_command: "curl -sX GET https://repo.jellyfin.org/ubuntu/dists/focal/main/binary-amd64/Packages |grep -A 7 -m 1 'Package: jellyfin-server' | awk -F ': ' '/Version/{print $2;exit}'"
+custom_version_command: "curl -sX GET https://repo.jellyfin.org/ubuntu/dists/jammy/main/binary-amd64/Packages |grep -A 7 -m 1 'Package: jellyfin-server' | awk -F ': ' '/Version/{print $2;exit}'"
 release_type: stable
 release_tag: latest
 ls_branch: master