From a9b0d6f8b6d28abd2476c3cf0418d4b4f083e55e Mon Sep 17 00:00:00 2001 From: kjeld Schouten-Lebbing Date: Sun, 18 Apr 2021 17:30:39 +0200 Subject: [PATCH] try a different build of ffmpeg --- .containers/apps/youtubedl/Dockerfile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.containers/apps/youtubedl/Dockerfile b/.containers/apps/youtubedl/Dockerfile index a28e2a899a5..df116ca42d3 100644 --- a/.containers/apps/youtubedl/Dockerfile +++ b/.containers/apps/youtubedl/Dockerfile @@ -28,6 +28,12 @@ RUN \ && tar ixzf /tmp/youtubedl.tgz -C /extract --strip-components=1 \ && cp /extract/package.json /extract/package-lock.json /extract/build +RUN \ + mkdir /extract/ffmpeg / + && export URL2="https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz" \ + && curl -fsSL -o /tmp/ffmpeg.tgz "${URL2}" \ + && tar ixzf /tmp/ffmpeg.tgz -C /extract/ffmpeg + # hadolint ignore=DL3016 RUN \ echo "==running NPM install==" \ @@ -58,7 +64,7 @@ ARG VERSION WORKDIR /app COPY --chown=apps:apps --from=builder [ "/extract/backend/package.json", "/extract/backend/package-lock.json", "/app/" ] - +COPY --chown=apps:apps --from=builder [ "/extract/ffmpeg/", "/app/ffmpeg/" ] # hadolint ignore=DL3008,DL3015,SC2086,SC2155,DL3003,DL3016 RUN \ apt-get -qq update \ @@ -66,12 +72,13 @@ RUN \ apt-get -qq install -y \ nodejs \ npm \ - ffmpeg \ youtube-dl \ unzip \ python \ ffmpeg \ atomicparsley \ + && sudo ln -s "/app/ffmpeg/ffmpeg" /usr/local/bin/ \ + && sudo ln -s "/app/ffmpeg/ffprobe" /usr/local/bin/ \ && mkdir /app/appdata || echo "" \ && mkdir /config/.cache || echo "" \ && mkdir /config/appdata || echo "" \