Merge pull request #53 from linuxserver/repofixes

Repofixes
2026-01-23 02:14:30 +00:00 · 2020-07-21 11:20:41 -04:00 · 2020-07-21 11:20:41 -04:00 · af3fa3a5c0
commit af3fa3a5c0
parent 6402055710 a6f6d7bde0
8 changed files with 42 additions and 64 deletions
--- a/21
+++ b/21
@ -16,28 +16,23 @@ 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 - && \
 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/* \
--- a/Dockerfile.aarch64
+++ b/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/* \
--- a/Dockerfile.armhf
+++ b/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/* \
--- a/34
+++ b/34
@ -16,9 +16,6 @@ pipeline {
    GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab')
    GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0')
    GITLAB_NAMESPACE=credentials('gitlab-namespace-id')
-    EXT_GIT_BRANCH = 'master'
-    EXT_USER = 'jellyfin'
-    EXT_REPO = 'jellyfin'
    BUILD_VERSION_ARG = 'JELLYFIN_RELEASE'
    LS_USER = 'linuxserver'
    LS_REPO = 'docker-jellyfin'
@ -101,23 +98,16 @@ pipeline {
    /* ########################
       External Release Tagging
       ######################## */
-    // If this is a stable github release use the latest endpoint from github to determine the ext tag
-    stage("Set ENV github_stable"){
-     steps{
-       script{
-         env.EXT_RELEASE = sh(
-           script: '''curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq -r '. | .tag_name' ''',
-           returnStdout: true).trim()
-       }
-     }
-    }
-    // If this is a stable or devel github release generate the link for the build message
-    stage("Set ENV github_link"){
-     steps{
-       script{
-         env.RELEASE_LINK = 'https://github.com/' + env.EXT_USER + '/' + env.EXT_REPO + '/releases/tag/' + env.EXT_RELEASE
-       }
-     }
+    // If this is a custom command to determine version use that command
+    stage("Set tag custom bash"){
+      steps{
+        script{
+          env.EXT_RELEASE = sh(
+            script: ''' 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}' ''',
+            returnStdout: true).trim()
+            env.RELEASE_LINK = 'custom_command'
+        }
+      }
    }
    // Sanitize the release tag and strip illegal docker or github characters
    stage("Sanitize tag"){
@ -672,11 +662,11 @@ pipeline {
             "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
        echo "Pushing New release for Tag"
        sh '''#! /bin/bash
-              curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq '. |.body' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json
+              echo "Updating to ${EXT_RELEASE_CLEAN}" > releasebody.json
              echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
                     "target_commitish": "master",\
                     "name": "'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
-                     "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**'${EXT_REPO}' Changes:**\\n\\n' > start
+                     "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**Remote Changes:**\\n\\n' > start
              printf '","draft": false,"prerelease": false}' >> releasebody.json
              paste -d'\\0' start releasebody.json > releasebody.json.done
              curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
--- a/README.md
+++ b/README.md
@ -296,6 +296,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

 ## Versions

+* **22.07.20:** - Ingest releases from Jellyfin repo.
 * **28.04.20:** - Replace MMAL/OMX dependency device `/dev/vc-mem` with `/dev/vcsm` as the former was not sufficient for raspbian.
 * **11.04.20:** - Enable hw decode (mmal) on Raspberry Pi, update readme instructions, add donation info, create missing default transcodes folder.
 * **11.03.20:** - Add Pi V4L2 support, remove optional transcode mapping (location is selected in the gui, defaults to path under `/config`).
--- a/jenkins-vars.yml
+++ b/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'
--- a/readme-vars.yml
+++ b/readme-vars.yml
@ -101,6 +101,7 @@ app_setup_block: |

 # changelog
 changelogs:
+  - { date: "22.07.20:", desc: "Ingest releases from Jellyfin repo." }
  - { date: "28.04.20:", desc: "Replace MMAL/OMX dependency device `/dev/vc-mem` with `/dev/vcsm` as the former was not sufficient for raspbian." }
  - { date: "11.04.20:", desc: "Enable hw decode (mmal) on Raspberry Pi, update readme instructions, add donation info, create missing default transcodes folder." }
  - { date: "11.03.20:", desc: "Add Pi V4L2 support, remove optional transcode mapping (location is selected in the gui, defaults to path under `/config`)." }
--- a/root/etc/services.d/jellyfin/run
+++ b/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