From 47710795bad25e22370effa274c9bbed9546336c Mon Sep 17 00:00:00 2001 From: YS Date: Sun, 23 Jan 2022 20:06:14 +0300 Subject: [PATCH] fix ffmpeg install on amd64 x3 (sorry) --- .github/workflows/pull_request.yml | 4 ++-- Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 131863e97..4ed9b46c7 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -55,7 +55,7 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - name: Build and run tests - run: make run_tests PLATFORM="linux/arm64/v8" ARCH="aarch64" + run: make run_tests PLATFORM="linux/arm64/v8" ARCH="aarch64" FFMPEG_ARCH="arm64" docker_tests_on_amd64: runs-on: ubuntu-latest @@ -67,4 +67,4 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - name: Build and run tests - run: make run_tests PLATFORM="linux/amd64" ARCH="amd64" + run: make run_tests PLATFORM="linux/amd64" ARCH="amd64" FFMPEG_ARCH="amd64" diff --git a/Makefile b/Makefile index d20982a65..ee1d7899f 100644 --- a/Makefile +++ b/Makefile @@ -91,7 +91,7 @@ run_tests: @sed -i "s/FROM frigate-base/#/g" docker/Dockerfile.test @echo "" >> docker/Dockerfile.test @echo "RUN python3 -m unittest" >> docker/Dockerfile.test - @docker buildx build --platform=$(PLATFORM) --tag frigate-base --build-arg NGINX_VERSION=1.0.2 --build-arg FFMPEG_VERSION=1.0.0 --build-arg ARCH=$(ARCH) --build-arg FFMPEG_ARCH=$(ARCH) --build-arg WHEELS_VERSION=1.0.3 --file docker/Dockerfile.test . + @docker buildx build --platform=$(PLATFORM) --tag frigate-base --build-arg NGINX_VERSION=1.0.2 --build-arg FFMPEG_VERSION=1.0.0 --build-arg ARCH=$(ARCH) --build-arg FFMPEG_ARCH=$(FFMPEG_ARCH) --build-arg WHEELS_VERSION=1.0.3 --file docker/Dockerfile.test . @rm docker/Dockerfile.test .PHONY: web run_tests