From a921adedc0d333c0431f8222e1bc6aab4dfaf8af Mon Sep 17 00:00:00 2001 From: tcely Date: Sun, 24 Nov 2024 07:13:19 -0500 Subject: [PATCH] Test the output for FFMPEG_VERSION exists The shell used on the build system doesn't support `pipefail` so test for output instead. It might be incorrect output, but in combination with running the `ffmpeg` binary earlier, this should be enough. --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 20466e95..130b54cc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -208,7 +208,8 @@ RUN set -x && \ # Append software versions RUN set -x && \ /usr/local/bin/ffmpeg -version && \ - FFMPEG_VERSION=$(set -o pipefail ; /usr/local/bin/ffmpeg -version | head -n 1 | awk '{ print $3 }' || exit) && \ + FFMPEG_VERSION=$(/usr/local/bin/ffmpeg -version | head -n 1 | awk '{ print $3 }') && \ + test -n "${FFMPEG_VERSION}" && \ printf -- "ffmpeg_version = '%s'\n" "${FFMPEG_VERSION}" >> /app/common/third_party_versions.py # Copy root