pin dep versions, add log message for device perms

Dockerfile

@@ -23,7 +23,7 @@ RUN \
   if [ -z ${JELLYFIN_RELEASE+x} ]; then \
     JELLYFIN="jellyfin"; \
   else \
-        JELLYFIN="jellyfin=${JELLYFIN_RELEASE}"; \
+    JELLYFIN="jellyfin=${JELLYFIN_RELEASE} jellyfin-server=${JELLYFIN_RELEASE} jellyfin-web=${JELLYFIN_RELEASE}"; \
   fi && \
   apt-get update && \
   apt-get install -y --no-install-recommends \
@@ -32,8 +32,6 @@ RUN \
     intel-media-va-driver-non-free \
     ${JELLYFIN} \
     jellyfin-ffmpeg \
-	jellyfin-server \
-	jellyfin-web \
     libfontconfig1 \
     libfreetype6 \
     libssl1.1 \

Dockerfile.aarch64

@@ -25,15 +25,13 @@ RUN \
   if [ -z ${JELLYFIN_RELEASE+x} ]; then \
     JELLYFIN="jellyfin"; \
   else \
-	JELLYFIN="jellyfin=${JELLYFIN_RELEASE}"; \
+    JELLYFIN="jellyfin=${JELLYFIN_RELEASE} jellyfin-server=${JELLYFIN_RELEASE} jellyfin-web=${JELLYFIN_RELEASE}"; \
   fi && \
   apt-get update && \
   apt-get install -y --no-install-recommends \
     at \
     ${JELLYFIN} \
     jellyfin-ffmpeg \
-	jellyfin-server \
-	jellyfin-web \
     libfontconfig1 \
     libfreetype6 \
     libomxil-bellagio0 \

Dockerfile.armhf

@@ -25,15 +25,13 @@ RUN \
   if [ -z ${JELLYFIN_RELEASE+x} ]; then \
     JELLYFIN="jellyfin"; \
   else \
-	JELLYFIN="jellyfin=${JELLYFIN_RELEASE}"; \
+    JELLYFIN="jellyfin=${JELLYFIN_RELEASE} jellyfin-server=${JELLYFIN_RELEASE} jellyfin-web=${JELLYFIN_RELEASE}"; \
   fi && \
   apt-get update && \
   apt-get install -y --no-install-recommends \
     at \
     ${JELLYFIN} \
     jellyfin-ffmpeg \
-	jellyfin-server \
-	jellyfin-web \
     libfontconfig1 \
     libfreetype6 \
     libomxil-bellagio0 \

README.md

@@ -64,7 +64,7 @@ This image provides various versions that are available via tags. `latest` tag u
 | Tag | Description |
 | :----: | --- |
 | latest | Stable Jellyfin releases - Focal baseimage |
-| bionic | Stable Jellyfin releases - Bionic baseimage |
+| bionic | DEPRECATED, no longer updated - Stable Jellyfin releases - Bionic baseimage |
 | nightly | Unstable Jellyfin releases |
 
 ## Application Setup
@@ -302,7 +302,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
-* **20.01.21:"** - Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information.
+* **23.06.21:** - Add log message if device permissions are incorrect. Pin jellyfin dependency versions to prevent upstream apt repo issues. 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.
 * **23.11.20:** - Rebase to Focal, branch off Bionic.
 * **22.07.20:** - Install nightly from unstable.

readme-vars.yml

@@ -17,7 +17,7 @@ available_architectures:
 development_versions: true
 development_versions_items:
   - { tag: "latest", desc: "Stable Jellyfin releases - Focal baseimage" }
-  - { tag: "bionic", desc: "Stable Jellyfin releases - Bionic baseimage" }
+  - { tag: "bionic", desc: "DEPRECATED, no longer updated - Stable Jellyfin releases - Bionic baseimage" }
   - { tag: "nightly", desc: "Unstable Jellyfin releases" }
 
 # container parameters
@@ -98,7 +98,8 @@ app_setup_block: |
 
 # changelog
 changelogs:
-  - { date: 20.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information." }
+  - { date: "23.06.21:", desc: "Add log message if device permissions are incorrect. Pin jellyfin dependency versions to prevent upstream apt repo issues. 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." }
   - { date: "23.11.20:", desc: "Rebase to Focal, branch off Bionic." }
   - { date: "22.07.20:", desc: "Install nightly from unstable." }

root/etc/cont-init.d/40-gid-video

@@ -13,6 +13,9 @@ do
             groupmod -g "$VIDEO_GID" "$VIDEO_NAME"
         fi
         usermod -a -G "$VIDEO_NAME" abc
+        if [ $(stat -c '%A' "${i}" | cut -b 8,9) != "rw" ]; then
+            echo -e "**** The device ${i} does not have group read/write permissions, which might prevent hardware transcode from functioning correctly. To fix it, you can run the following on your docker host: ****\nsudo chmod g+rw ${i}\n"
+        fi
     fi
 done
 

root/etc/services.d/jellyfin/run

@@ -1,10 +1,11 @@
 #!/usr/bin/with-contenv bash
 
-export JELLYFIN_DATA_DIR="/config/data" \
+export \
-JELLYFIN_CONFIG_DIR="/config" \
+    JELLYFIN_DATA_DIR="/config/data" \
-JELLYFIN_LOG_DIR="/config/log" \
+    JELLYFIN_CONFIG_DIR="/config" \
-JELLYFIN_CACHE_DIR="/config/cache" \
+    JELLYFIN_LOG_DIR="/config/log" \
-JELLYFIN_WEB_DIR="/usr/share/jellyfin/web"
+    JELLYFIN_CACHE_DIR="/config/cache" \
+    JELLYFIN_WEB_DIR="/usr/share/jellyfin/web"
 
 if [ -n "${UMASK_SET}" ] && [ -z "${UMASK}" ]; then
     echo -e "You are using a legacy method of defining umask\nplease update your environment variable from UMASK_SET to UMASK\nto keep the functionality after July 2021"