From 78fe534c83c0cafaaad271ce4e24d7cb83ef9754 Mon Sep 17 00:00:00 2001 From: Nick Mowen Date: Tue, 23 Aug 2022 07:07:00 -0600 Subject: [PATCH] Add standard ffmpeg for arm 32 --- docker/Dockerfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 78019f2d1..4ced8a5ac 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -79,11 +79,17 @@ RUN apt-get -qq update \ # coral drivers libedgetpu1-max python3-tflite-runtime python3-pycoral \ && pip3 install -U /wheels/*.whl \ - # btbn-ffmpeg + # btbn-ffmpeg -> amd64 / arm64 + && if [ "${TARGETARCH}" = "amd64" ] || [ "${TARGETARCH}" = "arm64" ]; then \ && mkdir -p /usr/lib/btbn-ffmpeg \ && wget -O btbn-ffmpeg.tar.xz "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2022-07-31-12-37/ffmpeg-n5.1-2-g915ef932a3-linux$( [ "$TARGETARCH" = "amd64" ] && echo "64" || echo "arm64" )-gpl-5.1.tar.xz" \ && tar -xf btbn-ffmpeg.tar.xz -C /usr/lib/btbn-ffmpeg --strip-components 1 \ && rm btbn-ffmpeg.tar.xz \ + fi \ + # ffmpeg -> arm32 + && if [ "${TARGETARCH}" = "arm" ]; then \ + apt-get -qq install --no-install-recommends --no-install-suggests -y ffmpeg \ + fi \ # arch specific packages && if [ "${TARGETARCH}" = "amd64" ]; then \ apt-get -qq install --no-install-recommends --no-install-suggests -y \