From 4f50e971ce76b14bd9953d3139bdf2d9e95ab4ea Mon Sep 17 00:00:00 2001 From: Shawn Jackson Date: Thu, 14 May 2026 16:08:23 -0700 Subject: [PATCH 1/3] RE1-T119 Build fix --- Web/Resgrid.Web.Tts/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Web/Resgrid.Web.Tts/Dockerfile b/Web/Resgrid.Web.Tts/Dockerfile index 26889ba9..a01b39f4 100644 --- a/Web/Resgrid.Web.Tts/Dockerfile +++ b/Web/Resgrid.Web.Tts/Dockerfile @@ -31,11 +31,11 @@ RUN apt-get update \ curl \ xz-utils \ && rm -rf /var/lib/apt/lists/* \ - && curl -fsSL --retry 3 --retry-delay 5 "https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-master-latest-linux64-gpl.tar.xz" -o /tmp/ffmpeg.tar.xz \ + && curl -fsSL --retry 3 --retry-delay 5 "https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz" -o /tmp/ffmpeg.tar.xz \ && tar -xf /tmp/ffmpeg.tar.xz -C /tmp \ && mkdir -p /usr/local/bin \ - && cp /tmp/ffmpeg-master-latest-linux64-gpl/bin/ffmpeg /usr/local/bin/ffmpeg \ - && cp /tmp/ffmpeg-master-latest-linux64-gpl/bin/ffprobe /usr/local/bin/ffprobe \ + && find /tmp -name 'ffmpeg' -type f -not -path '*/lib/*' -exec cp {} /usr/local/bin/ffmpeg \; \ + && find /tmp -name 'ffprobe' -type f -not -path '*/lib/*' -exec cp {} /usr/local/bin/ffprobe \; \ && chmod +x /usr/local/bin/ffmpeg /usr/local/bin/ffprobe \ && rm -rf /tmp/ffmpeg* \ && mkdir -p /usr/local/share/piper-voices \ From ca798f11e94c17b899288620e5cbc9321ce91b81 Mon Sep 17 00:00:00 2001 From: Shawn Jackson Date: Thu, 14 May 2026 16:12:06 -0700 Subject: [PATCH 2/3] RE1-T119 PR#385 fix --- Web/Resgrid.Web.Tts/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Web/Resgrid.Web.Tts/Dockerfile b/Web/Resgrid.Web.Tts/Dockerfile index a01b39f4..c116c8bd 100644 --- a/Web/Resgrid.Web.Tts/Dockerfile +++ b/Web/Resgrid.Web.Tts/Dockerfile @@ -34,8 +34,10 @@ RUN apt-get update \ && curl -fsSL --retry 3 --retry-delay 5 "https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz" -o /tmp/ffmpeg.tar.xz \ && tar -xf /tmp/ffmpeg.tar.xz -C /tmp \ && mkdir -p /usr/local/bin \ - && find /tmp -name 'ffmpeg' -type f -not -path '*/lib/*' -exec cp {} /usr/local/bin/ffmpeg \; \ - && find /tmp -name 'ffprobe' -type f -not -path '*/lib/*' -exec cp {} /usr/local/bin/ffprobe \; \ + && ffmpeg_path=$(find /tmp -name 'ffmpeg' -type f -executable -not -path '*/lib/*' -print -quit) \ + && test -n "$ffmpeg_path" && cp "$ffmpeg_path" /usr/local/bin/ffmpeg \ + && ffprobe_path=$(find /tmp -name 'ffprobe' -type f -executable -not -path '*/lib/*' -print -quit) \ + && test -n "$ffprobe_path" && cp "$ffprobe_path" /usr/local/bin/ffprobe \ && chmod +x /usr/local/bin/ffmpeg /usr/local/bin/ffprobe \ && rm -rf /tmp/ffmpeg* \ && mkdir -p /usr/local/share/piper-voices \ From 6f6fdf3f82c06866516a97b7f2472c5d5a5c6861 Mon Sep 17 00:00:00 2001 From: Shawn Jackson Date: Thu, 14 May 2026 16:19:56 -0700 Subject: [PATCH 3/3] RE1-T119 PR#385 fix --- Web/Resgrid.Web.Tts/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Web/Resgrid.Web.Tts/Dockerfile b/Web/Resgrid.Web.Tts/Dockerfile index c116c8bd..839a9d04 100644 --- a/Web/Resgrid.Web.Tts/Dockerfile +++ b/Web/Resgrid.Web.Tts/Dockerfile @@ -32,6 +32,9 @@ RUN apt-get update \ xz-utils \ && rm -rf /var/lib/apt/lists/* \ && curl -fsSL --retry 3 --retry-delay 5 "https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz" -o /tmp/ffmpeg.tar.xz \ + && curl -fsSL "https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz.md5" -o /tmp/ffmpeg.tar.xz.md5 \ + && echo "$(awk '{print $1}' /tmp/ffmpeg.tar.xz.md5) /tmp/ffmpeg.tar.xz" | md5sum -c - \ + && rm -f /tmp/ffmpeg.tar.xz.md5 \ && tar -xf /tmp/ffmpeg.tar.xz -C /tmp \ && mkdir -p /usr/local/bin \ && ffmpeg_path=$(find /tmp -name 'ffmpeg' -type f -executable -not -path '*/lib/*' -print -quit) \