Merge pull request #117 from linuxserver/master-deps

pin dep versions, log message about device perms

Dockerfile

@@ -24,7 +24,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 \

Dockerfile.aarch64

@@ -24,7 +24,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 \

Dockerfile.armhf

@@ -24,7 +24,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 \

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 | Nightly Jellyfin releases |
 
 ## Application Setup
@@ -327,6 +327,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **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.
 * **21.05.21:** - Add nvidia.icd file to fix missing tonemapping using Nvidia HW.
 * **20.01.21:** - Add Jellyfin Binary Environmentals
 * **20.01.21:** - Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information.

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: "Nightly Jellyfin releases" }
 
 # container parameters
@@ -115,6 +115,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { 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: "21.05.21:", desc: "Add nvidia.icd file to fix missing tonemapping using Nvidia HW." }
   - { date: "20.01.21:", desc: "Add Jellyfin Binary Environmentals" }
   - { date: "20.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information." }

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,9 +1,10 @@
 #!/usr/bin/with-contenv bash
 
-export JELLYFIN_DATA_DIR="/config/data" \
-JELLYFIN_CONFIG_DIR="/config" \
-JELLYFIN_LOG_DIR="/config/log" \
-JELLYFIN_CACHE_DIR="/config/cache"
+export \
+    JELLYFIN_DATA_DIR="/config/data" \
+    JELLYFIN_CONFIG_DIR="/config" \
+    JELLYFIN_LOG_DIR="/config/log" \
+    JELLYFIN_CACHE_DIR="/config/cache"
 
 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"