Merge pull request #90 from linuxserver/exec

Let ffmpeg terminate gracefully on docker stop/restart. Bump libharfbuzz, libpng, mesa, shaderc and libx265.

Dockerfile

@@ -21,7 +21,7 @@ ENV \
   FREETYPE=2.13.3 \
   FRIBIDI=1.0.15 \
   GMMLIB=22.3.20 \
-  HARFBUZZ=9.0.0 \
+  HARFBUZZ=10.0.0 \
   IHD=24.2.5 \
   KVAZAAR=2.3.1 \
   LAME=3.100 \
@@ -32,21 +32,21 @@ ENV \
   LIBGL=1.7.0 \
   LIBMFX=22.5.4 \
   LIBPLACEBO=7.349.0 \
-  LIBPNG=1.6.43 \
+  LIBPNG=1.6.44 \
   LIBVA=2.22.0 \
   LIBVDPAU=1.5 \
   LIBVIDSTAB=1.1.1 \
   LIBVMAF=3.0.0 \
   LIBVPL=2.13.0 \
-  MESA=24.2.1 \
+  MESA=24.2.3 \
   NVCODEC=n12.2.72.0 \
   OGG=1.3.5 \
   OPENCOREAMR=0.1.6 \
   OPENJPEG=2.5.2 \
   OPUS=1.5.2 \
   RAV1E=0.7.1 \
   RIST=0.2.10 \
-  SHADERC=v2024.1 \
+  SHADERC=v2024.3 \
   SRT=1.5.3 \
   SVTAV1=2.2.1 \
   THEORA=1.1.1 \
@@ -55,7 +55,7 @@ ENV \
   VPX=1.14.1 \
   VULKANSDK=vulkan-sdk-1.3.290.0 \
   WEBP=1.4.0 \
-  X265=3.6 \
+  X265=4.0 \
   XVID=1.3.7 \
   ZIMG=3.0.5 \
   ZMQ=v4.3.5

Dockerfile.aarch64

@@ -20,12 +20,12 @@ ENV \
   FONTCONFIG=2.15.0 \
   FREETYPE=2.13.3 \
   FRIBIDI=1.0.15 \
-  HARFBUZZ=9.0.0 \
+  HARFBUZZ=10.0.0 \
   KVAZAAR=2.3.1 \
   LAME=3.100 \
   LIBASS=0.17.3 \
   LIBDAV1D=1.4.3 \
-  LIBPNG=1.6.43 \
+  LIBPNG=1.6.44 \
   LIBVA=2.22.0 \
   LIBVDPAU=1.5 \
   LIBVIDSTAB=1.1.1 \
@@ -43,7 +43,7 @@ ENV \
   VORBIS=1.3.7 \
   VPX=1.14.1 \
   WEBP=1.4.0 \
-  X265=3.6 \
+  X265=4.0 \
   XVID=1.3.7 \
   ZIMG=3.0.5 \
   ZMQ=v4.3.5

README.md

@@ -174,6 +174,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **24.09.24:** - Let ffmpeg terminate gracefully on docker stop/restart. Bump libharfbuzz, libpng, mesa, shaderc and libx265.
 * **09.09.24:** - Add libzmq.
 * **31.08.24:** - Bump libaom, libdrm, libvpl, mesa and svtav1. Enable nvdec/nvenc on arm64 (untested).
 * **17.08.24:** - Bump ffmpeg, freetype, libdovi and mesa.

readme-vars.yml

@@ -178,6 +178,7 @@ full_custom_readme: |
 
   ## Versions
 
+  * **24.09.24:** - Let ffmpeg terminate gracefully on docker stop/restart. Bump libharfbuzz, libpng, mesa, shaderc and libx265.
   * **09.09.24:** - Add libzmq.
   * **31.08.24:** - Bump libaom, libdrm, libvpl, mesa and svtav1. Enable nvdec/nvenc on arm64 (untested).
   * **17.08.24:** - Bump ffmpeg, freetype, libdovi and mesa.

root/ffmpegwrapper.sh

@@ -13,11 +13,11 @@ set_uidgid () {
 run_ffmpeg () {
   # we do not have input file or it does not exist on disk just run as root
   if [ -z ${INPUT_FILE+x} ] || [ ! -f "${INPUT_FILE}" ]; then
-    /usr/local/bin/ffmpeg "${FULL_ARGS[@]}"
+    exec /usr/local/bin/ffmpeg "${FULL_ARGS[@]}"
   # we found the input file run as abc
   else
     set_uidgid
-    s6-setuidgid abc \
+    exec s6-setuidgid abc \
       /usr/local/bin/ffmpeg "${FULL_ARGS[@]}"
   fi
 }