linuxserver/docker-jellyfin
1
1
Fork 0
mirror of https://github.com/linuxserver/docker-jellyfin.git synced 2025-10-27 03:03:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix version check to use correct repo, update dockerfiles

Browse Source
This commit is contained in:
TheSpad
2023-04-23 18:45:59 +01:00
parent 78440b4824
commit b9162b70a4
4 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@@ -18,14 +18,12 @@ RUN \
curl -s https://repo.jellyfin.org/ubuntu/jellyfin_team.gpg.key | apt-key add - && \ 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 main' > /etc/apt/sources.list.d/jellyfin.list && \
if [ -z ${JELLYFIN_RELEASE+x} ]; then \ if [ -z ${JELLYFIN_RELEASE+x} ]; then \
JELLYFIN="jellyfin-server"; \ 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}'); \
else \
JELLYFIN="jellyfin-server=${JELLYFIN_RELEASE}"; \
fi && \ fi && \
apt-get update && \ apt-get update && \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
at \ at \
${JELLYFIN} \ jellyfin-server=${JELLYFIN_RELEASE} \
jellyfin-ffmpeg5 \ jellyfin-ffmpeg5 \
jellyfin-web \ jellyfin-web \
libfontconfig1 \ libfontconfig1 \

6
Dockerfile.aarch64
View File

@@ -18,14 +18,12 @@ RUN \
curl -s https://repo.jellyfin.org/ubuntu/jellyfin_team.gpg.key | apt-key add - && \ 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 main' > /etc/apt/sources.list.d/jellyfin.list && \
if [ -z ${JELLYFIN_RELEASE+x} ]; then \ if [ -z ${JELLYFIN_RELEASE+x} ]; then \
JELLYFIN="jellyfin-server"; \ 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}'); \
else \
JELLYFIN="jellyfin-server=${JELLYFIN_RELEASE}"; \
fi && \ fi && \
apt-get update && \ apt-get update && \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
at \ at \
${JELLYFIN} \ jellyfin-server=${JELLYFIN_RELEASE} \
jellyfin-ffmpeg5 \ jellyfin-ffmpeg5 \
jellyfin-web \ jellyfin-web \
libfontconfig1 \ libfontconfig1 \

6
Dockerfile.armhf
View File

@@ -18,14 +18,12 @@ RUN \
curl -s https://repo.jellyfin.org/ubuntu/jellyfin_team.gpg.key | apt-key add - && \ 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 && \ echo 'deb [arch=armhf] https://repo.jellyfin.org/ubuntu jammy main' > /etc/apt/sources.list.d/jellyfin.list && \
if [ -z ${JELLYFIN_RELEASE+x} ]; then \ if [ -z ${JELLYFIN_RELEASE+x} ]; then \
JELLYFIN="jellyfin-server"; \ 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}'); \
else \
JELLYFIN="jellyfin-server=${JELLYFIN_RELEASE}"; \
fi && \ fi && \
apt-get update && \ apt-get update && \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
at \ at \
${JELLYFIN} \ jellyfin-server=${JELLYFIN_RELEASE} \
jellyfin-ffmpeg5 \ jellyfin-ffmpeg5 \
jellyfin-web \ jellyfin-web \
libfontconfig1 \ libfontconfig1 \

2
jenkins-vars.yml
View File

@@ -3,7 +3,7 @@
# jenkins variables # jenkins variables
project_name: docker-jellyfin project_name: docker-jellyfin
external_type: na 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_type: stable
release_tag: latest release_tag: latest
ls_branch: master ls_branch: master