From 19e448c64ed6c5059ae87b4b157e298b60794a68 Mon Sep 17 00:00:00 2001 From: Josh Allmann Date: Sun, 7 Dec 2025 20:41:43 -0800 Subject: [PATCH 1/3] docker: fix ffmpeg build For some reason the docker build broke, maybe due to a runner or package update. Updating ffmpeg itself to 8.0.1 might fix it. --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 08851c827f..9ecfc6fdd5 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -30,7 +30,7 @@ RUN GRPC_HEALTH_PROBE_VERSION=v0.3.6 \ && chmod +x /usr/bin/grpc_health_probe \ && ldconfig /usr/local/lib -RUN FFMPEG_SHA=b76053d8bf322b197a9d07bd27bbdad14fd5bc15 git clone --depth 1 https://git.ffmpeg.org/ffmpeg.git /ffmpeg \ +RUN FFMPEG_SHA=894da5ca7d742e4429ffb2af534fcda0103ef593 git clone --depth 1 https://git.ffmpeg.org/ffmpeg.git /ffmpeg \ && cd /ffmpeg && git fetch --depth 1 origin ${FFMPEG_SHA} \ && git checkout ${FFMPEG_SHA} \ && ./configure --enable-gpl --enable-libx264 --enable-libfdk-aac --enable-nonfree --prefix=build && make -j"$(nproc)" && make install From 9d8aa27f456fbbd60cf01067167d114d9c9144fc Mon Sep 17 00:00:00 2001 From: Josh Allmann Date: Tue, 9 Dec 2025 18:12:33 +0000 Subject: [PATCH 2/3] docker: Build latest version of NASM Fixes the ffmpeg build in Docker that somehow broke. --- docker/Dockerfile | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 9ecfc6fdd5..a8a75093e5 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -12,7 +12,7 @@ ENV GOARCH="$TARGETARCH" \ CGO_LDFLAGS="-L/usr/local/cuda_${TARGETARCH}/lib64" RUN apt update \ - && apt install -yqq software-properties-common curl apt-transport-https lsb-release nasm \ + && apt install -yqq software-properties-common curl apt-transport-https lsb-release \ && curl -fsSL https://dl.google.com/go/go1.21.5.linux-${BUILDARCH}.tar.gz | tar -C /usr/local -xz \ && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \ && add-apt-repository "deb [arch=${BUILDARCH}] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \ @@ -30,7 +30,18 @@ RUN GRPC_HEALTH_PROBE_VERSION=v0.3.6 \ && chmod +x /usr/bin/grpc_health_probe \ && ldconfig /usr/local/lib -RUN FFMPEG_SHA=894da5ca7d742e4429ffb2af534fcda0103ef593 git clone --depth 1 https://git.ffmpeg.org/ffmpeg.git /ffmpeg \ +# nasm needed for ffmpeg +RUN curl -o /nasm-3.01.tar.gz "https://www.nasm.us/pub/nasm/releasebuilds/3.01/nasm-3.01.tar.gz" \ + && echo "aea120d4adb0241f08ae24d6add09e4a993bc1c4d9f754dbfc8020d6916c9be1 nasm-3.01.tar.gz" > /nasm-3.01.tar.gz.sha256 \ + && sha256sum -c /nasm-3.01.tar.gz.sha256 \ + && tar xf /nasm-3.01.tar.gz \ + && rm /nasm-3.01.tar.gz /nasm-3.01.tar.gz.sha256 \ + && cd /nasm-3.01 \ + && ./configure \ + && make \ + && make install + +RUN FFMPEG_SHA=b76053d8bf322b197a9d07bd27bbdad14fd5bc15 git clone --depth 1 https://git.ffmpeg.org/ffmpeg.git /ffmpeg \ && cd /ffmpeg && git fetch --depth 1 origin ${FFMPEG_SHA} \ && git checkout ${FFMPEG_SHA} \ && ./configure --enable-gpl --enable-libx264 --enable-libfdk-aac --enable-nonfree --prefix=build && make -j"$(nproc)" && make install From 51f1bf1dbea67e0840b48432f831cbef7b9433d9 Mon Sep 17 00:00:00 2001 From: Josh Allmann Date: Tue, 9 Dec 2025 18:18:52 +0000 Subject: [PATCH 3/3] spaces > tabs --- docker/Dockerfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index a8a75093e5..6ed4a49705 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -32,14 +32,14 @@ RUN GRPC_HEALTH_PROBE_VERSION=v0.3.6 \ # nasm needed for ffmpeg RUN curl -o /nasm-3.01.tar.gz "https://www.nasm.us/pub/nasm/releasebuilds/3.01/nasm-3.01.tar.gz" \ - && echo "aea120d4adb0241f08ae24d6add09e4a993bc1c4d9f754dbfc8020d6916c9be1 nasm-3.01.tar.gz" > /nasm-3.01.tar.gz.sha256 \ - && sha256sum -c /nasm-3.01.tar.gz.sha256 \ - && tar xf /nasm-3.01.tar.gz \ - && rm /nasm-3.01.tar.gz /nasm-3.01.tar.gz.sha256 \ - && cd /nasm-3.01 \ - && ./configure \ - && make \ - && make install + && echo "aea120d4adb0241f08ae24d6add09e4a993bc1c4d9f754dbfc8020d6916c9be1 nasm-3.01.tar.gz" > /nasm-3.01.tar.gz.sha256 \ + && sha256sum -c /nasm-3.01.tar.gz.sha256 \ + && tar xf /nasm-3.01.tar.gz \ + && rm /nasm-3.01.tar.gz /nasm-3.01.tar.gz.sha256 \ + && cd /nasm-3.01 \ + && ./configure \ + && make \ + && make install RUN FFMPEG_SHA=b76053d8bf322b197a9d07bd27bbdad14fd5bc15 git clone --depth 1 https://git.ffmpeg.org/ffmpeg.git /ffmpeg \ && cd /ffmpeg && git fetch --depth 1 origin ${FFMPEG_SHA} \