pull individual packages instead of wrapper

This commit is contained in:
aptalca
2021-09-22 09:33:42 -04:00
parent 5fb6a72e27
commit 1684729771
8 changed files with 11 additions and 12 deletions

View File

@@ -18,7 +18,7 @@ jobs:
fi
echo "**** External trigger running off of nightly branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_JELLYFIN_NIGHTLY\". ****"
echo "**** Retrieving external version ****"
EXT_RELEASE=$(curl -sX GET https://repo.jellyfin.org/ubuntu/dists/focal/unstable/binary-amd64/Packages |grep -A 7 -m 1 'Package: jellyfin' | awk -F ': ' '/Version/{print $2;exit}')
EXT_RELEASE=$(curl -sX GET https://repo.jellyfin.org/ubuntu/dists/focal/unstable/binary-amd64/Packages |grep -A 7 -m 1 'Package: jellyfin-server' | awk -F ': ' '/Version/{print $2;exit}')
if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
echo "**** Can't retrieve external version, exiting ****"
FAILURE_REASON="Can't retrieve external version for jellyfin branch nightly"

View File

@@ -21,9 +21,9 @@ RUN \
echo 'deb [arch=amd64] https://repo.jellyfin.org/ubuntu focal main' > /etc/apt/sources.list.d/jellyfin.list && \
echo 'deb [arch=amd64] https://repo.jellyfin.org/ubuntu focal unstable' >> /etc/apt/sources.list.d/jellyfin.list && \
if [ -z ${JELLYFIN_RELEASE+x} ]; then \
JELLYFIN="jellyfin"; \
JELLYFIN="jellyfin-server"; \
else \
JELLYFIN="jellyfin=${JELLYFIN_RELEASE}"; \
JELLYFIN="jellyfin-server=${JELLYFIN_RELEASE}"; \
fi && \
apt-get update && \
apt-get install -y --no-install-recommends \
@@ -32,7 +32,6 @@ RUN \
intel-media-va-driver-non-free \
${JELLYFIN} \
jellyfin-ffmpeg \
jellyfin-server \
jellyfin-web \
libfontconfig1 \
libfreetype6 \

View File

@@ -23,16 +23,15 @@ RUN \
echo 'deb [arch=arm64] https://repo.jellyfin.org/ubuntu focal unstable' >> /etc/apt/sources.list.d/jellyfin.list && \
echo "deb http://ppa.launchpad.net/ubuntu-raspi2/ppa-nightly/ubuntu focal main">> /etc/apt/sources.list.d/raspbins.list && \
if [ -z ${JELLYFIN_RELEASE+x} ]; then \
JELLYFIN="jellyfin"; \
JELLYFIN="jellyfin-server"; \
else \
JELLYFIN="jellyfin=${JELLYFIN_RELEASE}"; \
JELLYFIN="jellyfin-server=${JELLYFIN_RELEASE}"; \
fi && \
apt-get update && \
apt-get install -y --no-install-recommends \
at \
${JELLYFIN} \
jellyfin-ffmpeg \
jellyfin-server \
jellyfin-web \
libfontconfig1 \
libfreetype6 \

View File

@@ -23,16 +23,15 @@ RUN \
echo 'deb [arch=armhf] https://repo.jellyfin.org/ubuntu focal unstable' >> /etc/apt/sources.list.d/jellyfin.list && \
echo "deb http://ppa.launchpad.net/ubuntu-raspi2/ppa-nightly/ubuntu focal main">> /etc/apt/sources.list.d/raspbins.list && \
if [ -z ${JELLYFIN_RELEASE+x} ]; then \
JELLYFIN="jellyfin"; \
JELLYFIN="jellyfin-server"; \
else \
JELLYFIN="jellyfin=${JELLYFIN_RELEASE}"; \
JELLYFIN="jellyfin-server=${JELLYFIN_RELEASE}"; \
fi && \
apt-get update && \
apt-get install -y --no-install-recommends \
at \
${JELLYFIN} \
jellyfin-ffmpeg \
jellyfin-server \
jellyfin-web \
libfontconfig1 \
libfreetype6 \

2
Jenkinsfile vendored
View File

@@ -103,7 +103,7 @@ pipeline {
steps{
script{
env.EXT_RELEASE = sh(
script: ''' curl -sX GET https://repo.jellyfin.org/ubuntu/dists/focal/unstable/binary-amd64/Packages |grep -A 7 -m 1 'Package: jellyfin' | awk -F ': ' '/Version/{print $2;exit}' ''',
script: ''' curl -sX GET https://repo.jellyfin.org/ubuntu/dists/focal/unstable/binary-amd64/Packages |grep -A 7 -m 1 'Package: jellyfin-server' | awk -F ': ' '/Version/{print $2;exit}' ''',
returnStdout: true).trim()
env.RELEASE_LINK = 'custom_command'
}

View File

@@ -299,6 +299,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **22.09.21:** - Pull only the server, web and ffmpeg packages instead of the wrapper.
* **23.06.21:** - Add log message if device permissions are incorrect. Deprecate the `bionic` tag.
* **20.01.21:** - Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information.
* **05.01.21:** - Add nvidia.icd file to fix missing tonemapping using Nvidia HW.

View File

@@ -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/unstable/binary-amd64/Packages |grep -A 7 -m 1 'Package: jellyfin' | awk -F ': ' '/Version/{print $2;exit}'"
custom_version_command: "curl -sX GET https://repo.jellyfin.org/ubuntu/dists/focal/unstable/binary-amd64/Packages |grep -A 7 -m 1 'Package: jellyfin-server' | awk -F ': ' '/Version/{print $2;exit}'"
release_type: prerelease
release_tag: nightly
ls_branch: nightly

View File

@@ -98,6 +98,7 @@ app_setup_block: |
# changelog
changelogs:
- { date: "22.09.21:", desc: "Pull only the server, web and ffmpeg packages instead of the wrapper." }
- { date: "23.06.21:", desc: "Add log message if device permissions are incorrect. Deprecate the `bionic` tag." }
- { date: "20.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information." }
- { date: "05.01.21:", desc: "Add nvidia.icd file to fix missing tonemapping using Nvidia HW." }