From 659b8ac30574bca0f026f2f9a4a7dbe11376a75e Mon Sep 17 00:00:00 2001 From: Blake Blackshear Date: Wed, 23 Nov 2022 10:48:26 -0600 Subject: [PATCH] fix arm32 build --- Dockerfile | 3 ++- docker/install_deps.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 61d95821f..88e6da78d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,6 +41,7 @@ RUN --mount=type=bind,source=docker/install_s6_overlay.sh,target=/deps/install_s FROM base AS wheels ARG DEBIAN_FRONTEND +ARG TARGETARCH # Use a separate container to build wheels to prevent build dependencies in final image RUN apt-get -qq update \ @@ -145,7 +146,7 @@ CMD ["sleep", "infinity"] # Frigate web build -FROM deps-node AS web-build +FROM --platform=linux/amd64 deps-node AS web-build WORKDIR /work COPY web/package.json web/package-lock.json ./ diff --git a/docker/install_deps.sh b/docker/install_deps.sh index ccde3a6ec..88d1b45b8 100755 --- a/docker/install_deps.sh +++ b/docker/install_deps.sh @@ -69,7 +69,7 @@ if [[ "${TARGETARCH}" == "arm" ]]; then libgtk-3-dev \ libavcodec-dev libavformat-dev libswscale-dev libv4l-dev \ libxvidcore-dev libx264-dev libjpeg-dev libpng-dev libtiff-dev \ - gfortran openexr libatlas-base-dev libssl-devlibtbb2 libtbb-dev libdc1394-22-dev libopenexr-dev \ + gfortran openexr libatlas-base-dev libtbb-dev libdc1394-22-dev libopenexr-dev \ libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev fi