diff --git a/Dockerfile b/Dockerfile index 968d8b7..f2cf4c1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-ubuntu:noble +FROM ghcr.io/linuxserver/baseimage-ubuntu:resolute # set version label ARG BUILD_DATE @@ -19,9 +19,9 @@ ENV ATTACHED_DEVICES_PERMS="/dev/dri /dev/dvb /dev/vchiq /dev/vc-mem /dev/video1 RUN \ echo "**** install jellyfin *****" && \ curl -s https://repo.jellyfin.org/ubuntu/jellyfin_team.gpg.key | gpg --dearmor | tee /usr/share/keyrings/jellyfin.gpg >/dev/null && \ - echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/jellyfin.gpg] https://repo.jellyfin.org/ubuntu noble main' > /etc/apt/sources.list.d/jellyfin.list && \ + echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/jellyfin.gpg] https://repo.jellyfin.org/ubuntu resolute main' > /etc/apt/sources.list.d/jellyfin.list && \ if [ -z ${JELLYFIN_RELEASE+x} ]; then \ - JELLYFIN_RELEASE=$(curl -sX GET https://repo.jellyfin.org/ubuntu/dists/noble/main/binary-amd64/Packages |grep -A 7 -m 1 'Package: jellyfin-server' | awk -F ': ' '/Version/{print $2;exit}'); \ + JELLYFIN_RELEASE=$(curl -sX GET https://repo.jellyfin.org/ubuntu/dists/resolute/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 \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index f16fc19..72f80b4 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-noble +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-resolute # set version label ARG BUILD_DATE @@ -19,17 +19,15 @@ ENV ATTACHED_DEVICES_PERMS="/dev/dri /dev/dvb /dev/vchiq /dev/vc-mem /dev/video1 RUN \ echo "**** install jellyfin *****" && \ curl -s https://repo.jellyfin.org/ubuntu/jellyfin_team.gpg.key | gpg --dearmor | tee /usr/share/keyrings/jellyfin.gpg >/dev/null && \ - echo 'deb [arch=arm64 signed-by=/usr/share/keyrings/jellyfin.gpg] https://repo.jellyfin.org/ubuntu noble main' > /etc/apt/sources.list.d/jellyfin.list && \ + echo 'deb [arch=arm64 signed-by=/usr/share/keyrings/jellyfin.gpg] https://repo.jellyfin.org/ubuntu resolute main' > /etc/apt/sources.list.d/jellyfin.list && \ if [ -z ${JELLYFIN_RELEASE+x} ]; then \ - JELLYFIN_RELEASE=$(curl -sX GET https://repo.jellyfin.org/ubuntu/dists/noble/main/binary-amd64/Packages |grep -A 7 -m 1 'Package: jellyfin-server' | awk -F ': ' '/Version/{print $2;exit}'); \ + JELLYFIN_RELEASE=$(curl -sX GET https://repo.jellyfin.org/ubuntu/dists/resolute/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 \ libjemalloc2 \ - libomxil-bellagio0 \ - libomxil-bellagio-bin \ - libraspberrypi0 \ + mesa-va-drivers \ xmlstarlet && \ apt-get install -y --no-install-recommends \ jellyfin=${JELLYFIN_RELEASE} && \ diff --git a/README.md b/README.md index cb55318..263cc99 100644 --- a/README.md +++ b/README.md @@ -81,26 +81,6 @@ https://mods.linuxserver.io/?mod=jellyfin And follow this guide even if you are using iGPU: https://jellyfin.org/docs/general/administration/hardware-acceleration/intel/#configure-and-verify-lp-mode-on-linux -#### OpenMAX (Raspberry Pi) - -Hardware acceleration users for Raspberry Pi MMAL/OpenMAX will need to mount their `/dev/vcsm` and `/dev/vchiq` video devices inside of the container and their system OpenMax libs by passing the following options when running or creating the container: - -``` ---device=/dev/vcsm:/dev/vcsm ---device=/dev/vchiq:/dev/vchiq --v /opt/vc/lib:/opt/vc/lib -``` - -#### V4L2 (Raspberry Pi) - -Hardware acceleration users for Raspberry Pi V4L2 will need to mount their `/dev/video1X` devices inside of the container by passing the following options when running or creating the container: - -``` ---device=/dev/video10:/dev/video10 ---device=/dev/video11:/dev/video11 ---device=/dev/video12:/dev/video12 -``` - ### Hardware Acceleration Many desktop applications need access to a GPU to function properly and even some Desktop Environments have compositor effects that will not function without a GPU. However this is not a hard requirement and all base images will function without a video device mounted into the container. @@ -373,8 +353,9 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **14.07.26:** - Rebase to Ubuntu Resolute. * **02.03.26:** - Add support for IPv6 OOTB. -* **20.10.25:** - Add libjemalloc as runtime dep. +* **20.10.25:** - Add libjemalloc2 as runtime dep. * **06.10.24:** - Fix fontconfig cache path. * **13.08.24:** - Rebase to Ubuntu Noble. * **01.05.24:** - Increase verbosity of device permissions fixing. diff --git a/readme-vars.yml b/readme-vars.yml index 0039fcb..c818c67 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -68,26 +68,6 @@ app_setup_block: | https://mods.linuxserver.io/?mod=jellyfin And follow this guide even if you are using iGPU: https://jellyfin.org/docs/general/administration/hardware-acceleration/intel/#configure-and-verify-lp-mode-on-linux - - #### OpenMAX (Raspberry Pi) - - Hardware acceleration users for Raspberry Pi MMAL/OpenMAX will need to mount their `/dev/vcsm` and `/dev/vchiq` video devices inside of the container and their system OpenMax libs by passing the following options when running or creating the container: - - ``` - --device=/dev/vcsm:/dev/vcsm - --device=/dev/vchiq:/dev/vchiq - -v /opt/vc/lib:/opt/vc/lib - ``` - - #### V4L2 (Raspberry Pi) - - Hardware acceleration users for Raspberry Pi V4L2 will need to mount their `/dev/video1X` devices inside of the container by passing the following options when running or creating the container: - - ``` - --device=/dev/video10:/dev/video10 - --device=/dev/video11:/dev/video11 - --device=/dev/video12:/dev/video12 - ``` readme_hwaccel: true unraid_template_sync: false # init diagram @@ -133,8 +113,9 @@ init_diagram: | "jellyfin:latest" <- Base Images # changelog changelogs: + - {date: "14.07.26:", desc: "Rebase to Ubuntu Resolute."} - {date: "02.03.26:", desc: "Add support for IPv6 OOTB."} - - {date: "20.10.25:", desc: "Add libjemalloc as runtime dep."} + - {date: "20.10.25:", desc: "Add libjemalloc2 as runtime dep."} - {date: "06.10.24:", desc: "Fix fontconfig cache path."} - {date: "13.08.24:", desc: "Rebase to Ubuntu Noble."} - {date: "01.05.24:", desc: "Increase verbosity of device permissions fixing."}