From 91cebf6878bc221404c4e22769a0ba0fe3775a01 Mon Sep 17 00:00:00 2001 From: Pascal Minder Date: Sun, 28 Mar 2021 08:54:47 +0200 Subject: [PATCH] Jellyfin: amd Initial release --- .github/workflows/BuildImage.yml | 4 +- Dockerfile | 2 +- Dockerfile.complex | 23 ---------- README.md | 70 ++++++++++++++++++++++++------ root/etc/cont-init.d/98-mesa | 33 ++++++++++++++ root/etc/cont-init.d/98-vpn-config | 27 ------------ root/etc/services.d/sshvpn/run | 3 -- 7 files changed, 93 insertions(+), 69 deletions(-) delete mode 100644 Dockerfile.complex create mode 100644 root/etc/cont-init.d/98-mesa delete mode 100644 root/etc/cont-init.d/98-vpn-config delete mode 100644 root/etc/services.d/sshvpn/run diff --git a/.github/workflows/BuildImage.yml b/.github/workflows/BuildImage.yml index 518b0d8..2838c1c 100644 --- a/.github/workflows/BuildImage.yml +++ b/.github/workflows/BuildImage.yml @@ -4,8 +4,8 @@ on: [push, pull_request, workflow_dispatch] env: ENDPOINT: "linuxserver/mods" #don't modify - BASEIMAGE: "replace_baseimage" #replace - MODNAME: "replace_modname" #replace + BASEIMAGE: "jellyfin" + MODNAME: "amd" jobs: build: diff --git a/Dockerfile b/Dockerfile index 4ece5e8..852a7a7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM scratch -LABEL maintainer="username" +LABEL maintainer="PascalMinder" # copy local files COPY root/ / diff --git a/Dockerfile.complex b/Dockerfile.complex deleted file mode 100644 index db4598e..0000000 --- a/Dockerfile.complex +++ /dev/null @@ -1,23 +0,0 @@ -## Buildstage ## -FROM ghcr.io/linuxserver/baseimage-alpine:3.12 as buildstage - -RUN \ - echo "**** install packages ****" && \ - apk add --no-cache \ - curl && \ - echo "**** grab rclone ****" && \ - mkdir -p /root-layer && \ - curl -o \ - /root-layer/rclone.deb -L \ - "https://downloads.rclone.org/v1.47.0/rclone-v1.47.0-linux-amd64.deb" - -# copy local files -COPY root/ /root-layer/ - -## Single layer deployed image ## -FROM scratch - -LABEL maintainer="username" - -# Add files from buildstage -COPY --from=buildstage /root-layer/ / diff --git a/README.md b/README.md index 5636dec..b5ff615 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,61 @@ -# Rsync - Docker mod for openssh-server +# jellyfin-amd - Docker mode for Jellyfin -This mod adds rsync to openssh-server, to be installed/updated during container start. +This mode adds the mesa libraries (v20.1+) needed for hardware encoding (VAAPI) on AMD GPUs to the Jellyfin Docker container. -In openssh-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:openssh-server-rsync` +## Docker compose +The docker-compose file needs a `devices` entry for jellyfin ([Official Documentation](https://jellyfin.org/docs/general/administration/hardware-acceleration.html)) +``` +--- +version: "2.1" +services: + jellyfin: + image: linuxserver/jellyfin + container_name: jellyfin + environment: + - PUID=1000 + - PGID=1000 + - TZ=Europe/London + - UMASK=<022> #optional + - DOCKER_MODS=pascalminder/jellyfin-amd:jellyfin-amd + volumes: + - /path/to/library:/config + - /path/to/tvseries:/data/tvshows + - /path/to/movies:/data/movies + - /opt/vc/lib:/opt/vc/lib #optional + ports: + - 8096:8096 + - 8920:8920 #optional + - 7359:7359/udp #optional + - 1900:1900/udp #optional + devices: + # VAAPI Devices + - "/dev/dri/renderD128:/dev/dri/renderD128" + - "/dev/dri/card0:/dev/dri/card0" + restart: unless-stopped +``` -If adding multiple mods, enter them in an array separated by `|`, such as `DOCKER_MODS=linuxserver/mods:openssh-server-rsync|linuxserver/mods:openssh-server-mod2` +## Docker cli +``` +docker run -d \ + --name=jellyfin \ + -e PUID=1000 \ + -e PGID=1000 \ + -e TZ=Europe/London \ + -e UMASK=<022> `#optional` \ + -e DOCKER_MODS=pascalminder/jellyfin-amd:jellyfin-amd + -p 8096:8096 \ + -p 8920:8920 `#optional` \ + -p 7359:7359/udp `#optional` \ + -p 1900:1900/udp `#optional` \ + -v /path/to/library:/config \ + -v /path/to/tvseries:/data/tvshows \ + -v /path/to/movies:/data/movies \ + -v /opt/vc/lib:/opt/vc/lib `#optional` \ + --device /dev/dri/renderD128:/dev/dri/renderD128 \ + --device /dev/dri/card0:/dev/dri/card0 \ + --restart unless-stopped \ + linuxserver/jellyfin +``` -# Mod creation instructions - -* Fork the repo, create a new branch based on the branch `template`. -* Edit the `Dockerfile` for the mod. `Dockerfile.complex` is only an example and included for reference; it should be deleted when done. -* Inspect the `root` folder contents. Edit, add and remove as necessary. -* Edit this readme with pertinent info, delete these instructions. -* Finally edit the `.github/workflows/BuildImage.yml`. Customize the build branch, and the vars for `BASEIMAGE` and `MODNAME`. -* Ask the team to create a new branch named `-`. Baseimage should be the name of the image the mod will be applied to. The new branch will be based on the `template` branch. -* Submit PR against the branch created by the team. +## Settings in Jellyfin +Under server administration in `Server > Playback` the `Hardware acceleration` can be set to `Video Acceleration API (VAAPI)` and the `VA API Device` has to be set to the device given in the Docker configuration. For example `/dev/dri/renderD128`. diff --git a/root/etc/cont-init.d/98-mesa b/root/etc/cont-init.d/98-mesa new file mode 100644 index 0000000..e2c0c1f --- /dev/null +++ b/root/etc/cont-init.d/98-mesa @@ -0,0 +1,33 @@ +#!/usr/bin/with-contenv bash + +# Determine if setup is needed +if [ ! -f "/usr/bin/apt" ]; then + echo "**** Image is not Ubuntu, skipping opencl-intel install ****" + exit 0 +fi + +pkgs='mesa-vdpau-drivers mesa-va-drivers mesa-vdpau-drivers libdrm-radeon1' + +install=false +for pkg in $pkgs; do + status="$(dpkg-query -W --showformat='${db:Status-Status}' "$pkg" 2>&1)" + if [ ! $? = 0 ] || [ ! "$status" = installed ]; then + install=true + break + fi +done + +if "$install"; then + echo "**** Installing mesa ****" + apt-get update + + apt-get install -y \ + gpg + + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys F63F0F2B90935439 + echo "deb http://ppa.launchpad.net/kisak/kisak-mesa/ubuntu focal main" > /etc/apt/sources.list.d/kisak-ubuntu-kisak-mesa-bionic.list + + apt-get update + + apt-get install -y $pkgs +fi diff --git a/root/etc/cont-init.d/98-vpn-config b/root/etc/cont-init.d/98-vpn-config deleted file mode 100644 index a5f9127..0000000 --- a/root/etc/cont-init.d/98-vpn-config +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/with-contenv bash - -# Determine if setup is needed -if [ ! -f /usr/local/lib/python***/dist-packages/sshuttle ] && \ -[ -f /usr/bin/apt ]; then - ## Ubuntu - apt-get update - apt-get install --no-install-recommends -y \ - iptables \ - openssh-client \ - python3 \ - python3-pip - pip3 install sshuttle -fi -if [ ! -f /usr/lib/python***/site-packages/sshuttle ] && \ -[ -f /sbin/apk ]; then - # Alpine - apk add --no-cache \ - iptables \ - openssh \ - py3-pip \ - python3 - pip3 install sshuttle -fi - -chown -R root:root /root -chmod -R 600 /root/.ssh diff --git a/root/etc/services.d/sshvpn/run b/root/etc/services.d/sshvpn/run deleted file mode 100644 index 7d49e79..0000000 --- a/root/etc/services.d/sshvpn/run +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/with-contenv bash - -sshuttle --dns --remote root@${HOST}:${PORT} 0/0 -x 172.17.0.0/16