ingest from repos and add web path to run

Dockerfile

@@ -12,32 +12,23 @@ ARG DEBIAN_FRONTEND="noninteractive"
 ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility"
 
 RUN \
- echo "**** install packages ****" && \
+ echo "**** install jellyfin *****" && \
- apt-get update && \
- apt-get install -y --no-install-recommends \
-	gnupg && \
- echo "**** add jellyfin deps *****" && \
  curl -s https://repo.jellyfin.org/ubuntu/jellyfin_team.gpg.key | apt-key add - && \
  echo 'deb [arch=amd64] https://repo.jellyfin.org/ubuntu bionic main' > /etc/apt/sources.list.d/jellyfin.list && \
+ if [ -z ${JELLYFIN_RELEASE+x} ]; then \
+        JELLYFIN="jellyfin"; \
+ else \
+        JELLYFIN="jellyfin=${JELLYFIN_RELEASE}"; \
+ fi && \
  apt-get update && \
  apt-get install -y --no-install-recommends \
 	at \
 	i965-va-driver \
-	jellyfin-ffmpeg \
+	${JELLYFIN} \
 	libfontconfig1 \
 	libfreetype6 \
-	libssl1.0.0 \
+	libssl1.1 \
 	mesa-va-drivers && \
- echo "**** install jellyfin *****" && \
- if [ -z ${JELLYFIN_RELEASE+x} ]; then \
-	JELLYFIN_RELEASE=$(curl -sX GET "https://api.github.com/repos/jellyfin/jellyfin/releases/latest" \
-	| awk '/tag_name/{print $4;exit}' FS='[""]'); \
- fi && \
- VERSION=$(echo "${JELLYFIN_RELEASE}" | sed 's/^v//g') && \
- curl -o \
- /tmp/jellyfin.deb -L \
-	"https://github.com/jellyfin/jellyfin/releases/download/v${VERSION}/jellyfin_${VERSION}-1_ubuntu-amd64.deb" && \
- dpkg -i /tmp/jellyfin.deb && \
  echo "**** cleanup ****" && \
  rm -rf \
 	/tmp/* \

Dockerfile.aarch64

@@ -16,28 +16,25 @@ RUN \
  apt-get update && \
  apt-get install -y --no-install-recommends \
 	gnupg && \
- echo "**** add jellyfin deps *****" && \
+ echo "**** install jellyfin *****" && \
  curl -s https://repo.jellyfin.org/ubuntu/jellyfin_team.gpg.key | apt-key add - && \
+ curl -s https://keyserver.ubuntu.com/pks/lookup?op=get\&search=0x6587ffd6536b8826e88a62547876ae518cbcf2f2 | apt-key add - && \
  echo 'deb [arch=arm64] https://repo.jellyfin.org/ubuntu bionic main' > /etc/apt/sources.list.d/jellyfin.list && \
+ echo "deb http://ppa.launchpad.net/ubuntu-raspi2/ppa/ubuntu bionic main">> /etc/apt/sources.list.d/raspbins.list && \
+ if [ -z ${JELLYFIN_RELEASE+x} ]; then \
+	JELLYFIN="jellyfin"; \
+ else \
+	JELLYFIN="jellyfin=${JELLYFIN_RELEASE}"; \
+ fi && \
  apt-get update && \
  apt-get install -y --no-install-recommends \
 	at \
-	jellyfin-ffmpeg \
+	${JELLYFIN} \
 	libfontconfig1 \
 	libfreetype6 \
 	libomxil-bellagio0 \
 	libomxil-bellagio-bin \
 	libssl1.0.0 && \
- echo "**** install jellyfin *****" && \
- if [ -z ${JELLYFIN_RELEASE+x} ]; then \
-	JELLYFIN_RELEASE=$(curl -sX GET "https://api.github.com/repos/jellyfin/jellyfin/releases/latest" \
-	| awk '/tag_name/{print $4;exit}' FS='[""]'); \
- fi && \
- VERSION=$(echo "${JELLYFIN_RELEASE}" | sed 's/^v//g') && \
- curl -o \
- /tmp/jellyfin.deb -L \
-	"https://github.com/jellyfin/jellyfin/releases/download/v${VERSION}/jellyfin_${VERSION}-1_ubuntu-arm64.deb" && \
- dpkg -i /tmp/jellyfin.deb && \
  echo "**** cleanup ****" && \
  rm -rf \
 	/tmp/* \

Dockerfile.armhf

@@ -16,31 +16,26 @@ RUN \
  apt-get update && \
  apt-get install -y --no-install-recommends \
 	gnupg && \
- echo "**** add jellyfin deps *****" && \
+ echo "**** install jellyfin *****" && \
  curl -s https://repo.jellyfin.org/ubuntu/jellyfin_team.gpg.key | apt-key add - && \
  curl -s https://keyserver.ubuntu.com/pks/lookup?op=get\&search=0x6587ffd6536b8826e88a62547876ae518cbcf2f2 | apt-key add - && \
  echo 'deb [arch=armhf] https://repo.jellyfin.org/ubuntu bionic main' > /etc/apt/sources.list.d/jellyfin.list && \
  echo "deb http://ppa.launchpad.net/ubuntu-raspi2/ppa/ubuntu bionic main">> /etc/apt/sources.list.d/raspbins.list && \
+ if [ -z ${JELLYFIN_RELEASE+x} ]; then \
+	JELLYFIN="jellyfin"; \
+ else \
+	JELLYFIN="jellyfin=${JELLYFIN_RELEASE}"; \
+ fi && \
  apt-get update && \
  apt-get install -y --no-install-recommends \
 	at \
-	jellyfin-ffmpeg \
+	${JELLYFIN} \
 	libfontconfig1 \
 	libfreetype6 \
 	libomxil-bellagio0 \
 	libomxil-bellagio-bin \
 	libraspberrypi0 \
 	libssl1.0.0 && \
- echo "**** install jellyfin *****" && \
- if [ -z ${JELLYFIN_RELEASE+x} ]; then \
-	JELLYFIN_RELEASE=$(curl -sX GET "https://api.github.com/repos/jellyfin/jellyfin/releases/latest" \
-	| awk '/tag_name/{print $4;exit}' FS='[""]'); \
- fi && \
- VERSION=$(echo "${JELLYFIN_RELEASE}" | sed 's/^v//g') && \
- curl -o \
- /tmp/jellyfin.deb -L \
-	"https://github.com/jellyfin/jellyfin/releases/download/v${VERSION}/jellyfin_${VERSION}-1_ubuntu-armhf.deb" && \
- dpkg -i /tmp/jellyfin.deb && \
  echo "**** cleanup ****" && \
  rm -rf \
 	/tmp/* \

jenkins-vars.yml

@@ -2,14 +2,12 @@
 
 # jenkins variables
 project_name: docker-jellyfin
-external_type: github_stable
+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' | awk -F ': ' '/Version/{print $2;exit}'"
 release_type: stable
 release_tag: latest
 ls_branch: master
 repo_vars:
-  - EXT_GIT_BRANCH = 'master'
-  - EXT_USER = 'jellyfin'
-  - EXT_REPO = 'jellyfin'
   - BUILD_VERSION_ARG = 'JELLYFIN_RELEASE'
   - LS_USER = 'linuxserver'
   - LS_REPO = 'docker-jellyfin'

root/etc/services.d/jellyfin/run

@@ -11,4 +11,5 @@ umask "$UMASK_SET"
 
 exec \
 	s6-setuidgid abc /usr/bin/jellyfin \
-	--ffmpeg=/usr/lib/jellyfin-ffmpeg/ffmpeg
+	--ffmpeg=/usr/lib/jellyfin-ffmpeg/ffmpeg \
+	--webdir=/usr/share/jellyfin/web