From 10ad6b3faa1d0a98738afacc56698a7489159cef Mon Sep 17 00:00:00 2001 From: Mar0xy Date: Sun, 5 Nov 2023 21:00:07 +0100 Subject: [PATCH 1/2] upd: dockerfile use binary for ffmpeg --- Dockerfile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 60bd0871d..0fb81905d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,12 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ ; echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache \ && apt-get update \ && apt-get install -yqq --no-install-recommends \ - build-essential + build-essential curl ca-certificates + +ARG TARGETARCH + +RUN curl -L https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-$TARGETARCH-static.tar.xz -o /ffmpeg.tar.xz \ + && tar xvf /ffmpeg.tar.xz -C / --strip-components 1 --wildcards 'ffmpeg-*-static/ffmpeg' RUN corepack enable @@ -64,7 +69,7 @@ ARG GID="991" RUN apt-get update \ && apt-get install -y --no-install-recommends \ - ffmpeg tini curl libjemalloc-dev libjemalloc2 \ + tini curl libjemalloc-dev libjemalloc2 \ && ln -s /usr/lib/$(uname -m)-linux-gnu/libjemalloc.so.2 /usr/local/lib/libjemalloc.so \ && corepack enable \ && groupadd -g "${GID}" sharkey \ @@ -80,6 +85,8 @@ WORKDIR /sharkey COPY --chown=sharkey:sharkey --from=target-builder /sharkey/node_modules ./node_modules COPY --chown=sharkey:sharkey --from=target-builder /sharkey/packages/megalodon/node_modules ./packages/megalodon/node_modules COPY --chown=sharkey:sharkey --from=target-builder /sharkey/packages/backend/node_modules ./packages/backend/node_modules +COPY --chown=sharkey:sharkey --from=native-builder /ffmpeg /usr/local/bin/ +COPY --chown=sharkey:sharkey --from=native-builder /ffprobe /usr/local/bin/ COPY --chown=sharkey:sharkey --from=native-builder /sharkey/built ./built COPY --chown=sharkey:sharkey --from=native-builder /sharkey/packages/megalodon/lib ./packages/megalodon/lib COPY --chown=sharkey:sharkey --from=native-builder /sharkey/packages/backend/built ./packages/backend/built From 826307bb3afa2b5dc0c476c3f57b99fccade91e7 Mon Sep 17 00:00:00 2001 From: Mar0xy Date: Sun, 5 Nov 2023 21:02:22 +0100 Subject: [PATCH 2/2] upd: include ffprobe in dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0fb81905d..66018a01c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ ARG TARGETARCH RUN curl -L https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-$TARGETARCH-static.tar.xz -o /ffmpeg.tar.xz \ - && tar xvf /ffmpeg.tar.xz -C / --strip-components 1 --wildcards 'ffmpeg-*-static/ffmpeg' + && tar xvf /ffmpeg.tar.xz -C / --strip-components 1 --wildcards 'ffmpeg-*-static/ffmpeg' 'ffmpeg-*-static/ffprobe' RUN corepack enable