Merge pull request #100 from linuxserver/master-noble

Author: thespad

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy
+FROM ghcr.io/linuxserver/baseimage-ubuntu:noble
 
 # set version label
 ARG BUILD_DATE
@@ -31,9 +31,12 @@ RUN \
   mv -t \
     /app/emby/ \
     /tmp/emby/opt/emby-server/* && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   rm -rf \
-    /tmp/*
+    /tmp/* \
+    /var/lib/apt/lists/* \
+    /var/tmp/*
 
 # add local files
 COPY root/ /

Dockerfile.aarch64

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-noble
 
 # set version label
 ARG BUILD_DATE
@@ -16,8 +16,6 @@ ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility"
 
 RUN \
   echo "**** add emby deps *****" && \
-  curl -s https://keyserver.ubuntu.com/pks/lookup?op=get\&search=0x6587ffd6536b8826e88a62547876ae518cbcf2f2 | gpg --dearmor | tee /usr/share/keyrings/raspbins.gpg >/dev/null && \
-  echo "deb [signed-by=/usr/share/keyrings/raspbins.gpg] http://ppa.launchpad.net/ubuntu-raspi2/ppa-nightly/ubuntu focal main">> /etc/apt/sources.list.d/raspbins.list && \
   apt-get update && \
   apt-get install -y --no-install-recommends \
     libomxil-bellagio0 \
@@ -38,6 +36,7 @@ RUN \
   mv -t \
     /app/emby/ \
     /tmp/emby/opt/emby-server/* && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   rm -rf \
     /tmp/* \

Jenkinsfile

@@ -34,8 +34,8 @@ pipeline {
     CI_PORT='8096'
     CI_SSL='false'
     CI_DELAY='120'
-    CI_DOCKERENV='TZ=US/Pacific'
-    CI_AUTH='user:password'
+    CI_DOCKERENV=''
+    CI_AUTH=''
     CI_WEBPATH=''
   }
   stages {

README.md

@@ -138,7 +138,7 @@ services:
       - PGID=1000
       - TZ=Etc/UTC
     volumes:
-      - /path/to/library:/config
+      - /path/to/emby/library:/config
       - /path/to/tvshows:/data/tvshows
       - /path/to/movies:/data/movies
       - /opt/vc/lib:/opt/vc/lib #optional
@@ -164,7 +164,7 @@ docker run -d \
   -e TZ=Etc/UTC \
   -p 8096:8096 \
   -p 8920:8920 `#optional` \
-  -v /path/to/library:/config \
+  -v /path/to/emby/library:/config \
   -v /path/to/tvshows:/data/tvshows \
   -v /path/to/movies:/data/movies \
   -v /opt/vc/lib:/opt/vc/lib `#optional` \
@@ -359,6 +359,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **13.08.24:** - Rebase to Ubuntu Noble.
 * **12.02.24:** - Use universal hardware acceleration blurb
 * **19.01.24:** - Fix tonemapping so it's done with hw acceleration.
 * **06.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)

jenkins-vars.yml

@@ -25,6 +25,6 @@ repo_vars:
   - CI_PORT='8096'
   - CI_SSL='false'
   - CI_DELAY='120'
-  - CI_DOCKERENV='TZ=US/Pacific'
-  - CI_AUTH='user:password'
+  - CI_DOCKERENV=''
+  - CI_AUTH=''
   - CI_WEBPATH=''

readme-vars.yml

@@ -20,18 +20,13 @@ common_param_env_vars_enabled: true #PGID, PUID, etc
 param_container_name: "{{ project_name }}"
 param_usage_include_vols: true
 param_volumes:
-  - {vol_path: "/config", vol_host_path: "/path/to/library", desc: "Emby data storage location. *This can grow very large, 50gb+ is likely for a large collection.*"}
+  - {vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/library", desc: "Emby data storage location. *This can grow very large, 50gb+ is likely for a large collection.*"}
   - {vol_path: "/data/tvshows", vol_host_path: "/path/to/tvshows", desc: "Media goes here. Add as many as needed e.g. `/data/movies`, `/data/tv`, etc."}
   - {vol_path: "/data/movies", vol_host_path: "/path/to/movies", desc: "Media goes here. Add as many as needed e.g. `/data/movies`, `/data/tv`, etc."}
 param_usage_include_ports: true
 param_ports:
   - {external_port: "8096", internal_port: "8096", port_desc: "Http webUI."}
-param_usage_include_env: true
-param_env_vars:
-  - {env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"}
 # optional container parameters
-opt_param_usage_include_env: false
-opt_param_env_vars:
 opt_param_usage_include_vols: true
 opt_param_volumes:
   - {vol_path: "/opt/vc/lib", vol_host_path: "/opt/vc/lib", desc: "Path for Raspberry Pi OpenMAX libs *optional*."}
@@ -80,6 +75,7 @@ app_setup_block: |
 readme_hwaccel: true
 # changelog
 changelogs:
+  - {date: "13.08.24:", desc: "Rebase to Ubuntu Noble."}
   - {date: "12.02.24:", desc: "Use universal hardware acceleration blurb"}
   - {date: "19.01.24:", desc: "Fix tonemapping so it's done with hw acceleration."}
   - {date: "06.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"}

root/etc/s6-overlay/s6-rc.d/init-emby/dependencies.d/init-config renamed to root/etc/s6-overlay/s6-rc.d/init-emby-config/dependencies.d/init-config

@@ -1,4 +1,5 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
 # Create folders
 mkdir -p \

root/etc/s6-overlay/s6-rc.d/init-emby/run renamed to root/etc/s6-overlay/s6-rc.d/init-emby-config/run

@@ -0,0 +1 @@
+oneshot

root/etc/s6-overlay/s6-rc.d/init-emby-config/type

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-emby-config/run

root/etc/s6-overlay/s6-rc.d/init-emby-config/up

@@ -1,23 +1,23 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
 FILES=$(find /dev/dri /dev/dvb /dev/vchiq /dev/video1? -type c -print 2>/dev/null)
 
-for i in $FILES
-do
+for i in ${FILES}; do
     VIDEO_GID=$(stat -c '%g' "${i}")
     VIDEO_UID=$(stat -c '%u' "${i}")
     # check if user matches device
     if id -u abc | grep -qw "${VIDEO_UID}"; then
         echo "**** permissions for ${i} are good ****"
     else
         # check if group matches and that device has group rw
-        if id -G abc | grep -qw "${VIDEO_GID}" && [ $(stat -c '%A' "${i}" | cut -b 5,6) = "rw" ]; then
+        if id -G abc | grep -qw "${VIDEO_GID}" && [[ $(stat -c '%A' "${i}" | cut -b 5,6) == "rw" ]]; then
             echo "**** permissions for ${i} are good ****"
         # check if device needs to be added to video group
         elif ! id -G abc | grep -qw "${VIDEO_GID}"; then
             # check if video group needs to be created
             VIDEO_NAME=$(getent group "${VIDEO_GID}" | awk -F: '{print $1}')
-            if [ -z "${VIDEO_NAME}" ]; then
+            if [[ -z "${VIDEO_NAME}" ]]; then
                 VIDEO_NAME="video$(head /dev/urandom | tr -dc 'a-z0-9' | head -c4)"
                 groupadd "${VIDEO_NAME}"
                 groupmod -g "${VIDEO_GID}" "${VIDEO_NAME}"
@@ -27,13 +27,14 @@ do
             usermod -a -G "${VIDEO_NAME}" abc
         fi
         # check if device has group rw
-        if [ $(stat -c '%A' "${i}" | cut -b 5,6) != "rw" ]; then
+        if [[ $(stat -c '%A' "${i}" | cut -b 5,6) != "rw" ]]; then
             echo -e "**** The device ${i} does not have group read/write permissions, attempting to fix inside the container. ****"
             chmod g+rw "${i}"
         fi
     fi
 done
 
+
 # openmax lib loading
 if [ -e "/opt/vc/lib" ] && [ ! -e "/etc/ld.so.conf.d/00-vmcs.conf" ]; then
     echo "[emby-init] Pi Libs detected loading"

root/etc/s6-overlay/s6-rc.d/init-emby/type

@@ -1 +1 @@
-oneshot
+oneshot

root/etc/s6-overlay/s6-rc.d/init-emby/up

@@ -1 +1 @@
-/etc/s6-overlay/s6-rc.d/init-video/run
+/etc/s6-overlay/s6-rc.d/init-video/run

root/etc/s6-overlay/s6-rc.d/init-video/dependencies.d/init-emby renamed to root/etc/s6-overlay/s6-rc.d/init-video/dependencies.d/init-emby-config

@@ -1,4 +1,5 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
 # env settings
 APP_DIR="/app/emby"

root/etc/s6-overlay/s6-rc.d/init-video/run

@@ -1 +1 @@
-longrun
+longrun