icedreammusic/docker-compose.yml

@@ -3,9 +3,9 @@ volumes:
   metadatabase:
   library:
     driver_opts:
-      type: "${LIBRARY_VOLUME_TYPE:-local}"
+      type: ${LIBRARY_VOLUME_TYPE}
-      o: "${LIBRARY_VOLUME_OPTIONS:-defaults}"
+      o: ${LIBRARY_VOLUME_OPTIONS}
-      device: "${LIBRARY_VOLUME_DEVICE:-/var/tmp/whatever}"
+      device: ${LIBRARY_VOLUME_DEVICE}
 services:
   liquidsoap:
     image: icedream/liquidsoap
@@ -46,11 +46,11 @@ services:
     # HACK - haven't quite figured out the ports SRT/NDI use
     network_mode: host
     command:
-      - '/usr/local/bin/tunaposter'
+      - /usr/local/bin/tunaposter
       # tuna source URL
-      - '${TUNA_SOURCE_URL:-http://localhost}'
+      - ${TUNA_SOURCE_URL}
       # liquidsoap metadata API URL
-      - 'http://127.0.0.1:21338'
+      - http://127.0.0.1:21338
     deploy:
       resources:
         limits:

icedreammusic/ndi-to-srt/ndi-to-srt.sh

@@ -16,18 +16,7 @@ shutdown_ffmpeg() {
     if is_ffmpeg_running
     then
         kill "$ffmpeg_pid" || true
-        for t in $(seq 0 10)
+        wait "$ffmpeg_pid" || true
-        do
-            if ! kill -0 "$ffmpeg_pid"
-            then
-                break
-            fi
-            sleep 1
-        done
-        if kill -0 "$ffmpeg_pid"
-        then
-            kill -9 "$ffmpeg_pid" || true
-        fi
     fi
     ffmpeg_pid=
 }