From 11a1ff0f4fef7cdd5df10772059b180205873e65 Mon Sep 17 00:00:00 2001 From: YS Date: Wed, 23 Mar 2022 13:27:42 +0300 Subject: [PATCH] update makefile --- Makefile | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/Makefile b/Makefile index e84d9e6d6..7f7baafc2 100644 --- a/Makefile +++ b/Makefile @@ -26,29 +26,14 @@ l4t_wheels: @docker commit $$CONTAINER_ID frigate.wheels.l4t frigate-wheels-l4t:latest @docker rm frigate.wheels.l4t || true -l4t_frigate: # l4t_wheels l4t_assets +l4t_frigate: l4t_wheels l4t_assets @cat docker/Dockerfile | sed "s|#use_l4t: ||g" > docker/Dockerfile.l4t DOCKER_BUILDKIT=1 docker build --progress=plain -t frigate.l4t --build-arg FRIGATE_BASE_IMAGE=timongentzsch/l4t-ubuntu20-opencv:latest -f docker/Dockerfile.l4t . - # docker build --tag frigate-base-l4t --build-arg BASE_IMAGE=timongentzsch/l4t-ubuntu20-opencv:latest --build-arg FFMPEG_ARCH=arm64 --build-arg ARCH=aarch64 --build-arg WHEELS_VERSION=1.0.3 --build-arg NGINX_VERSION=1.0.2 --file docker/Dockerfile.base . - # nvidia-docker build --tag frigate.l4t --build-arg NGINX_VERSION=1.0.2 --file docker/Dockerfile.aarch64.l4t . - frigate: version DOCKER_BUILDKIT=1 docker build --progress=plain -t frigate -f docker/Dockerfile . frigate_push: version docker buildx build --push --platform linux/arm64/v8,linux/amd64 --tag blakeblackshear/frigate:0.11.0-$(COMMIT_HASH) --file docker/Dockerfile . -# run_tests: -# # PLATFORM: linux/arm64/v8 linux/amd64 or linux/arm/v7 -# # ARCH: aarch64 amd64 or armv7 -# @cat docker/Dockerfile.base docker/Dockerfile.$(ARCH) > docker/Dockerfile.test -# @sed -i "s/FROM frigate-web as web/#/g" docker/Dockerfile.test -# @sed -i "s/COPY --from=web \/opt\/frigate\/build web\//#/g" docker/Dockerfile.test -# @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=$(FFMPEG_ARCH) --build-arg WHEELS_VERSION=1.0.3 --file docker/Dockerfile.test . -# @rm docker/Dockerfile.test - .PHONY: run_tests l4t_frigate