From 26a681d54a4af01569750ff147414788b6f57953 Mon Sep 17 00:00:00 2001
From: Felipe Santos <felipecassiors@gmail.com>
Date: Mon, 14 Nov 2022 20:04:49 -0300
Subject: [PATCH] Fix CI

---
 .dockerignore                      | 6 +++++-
 .github/workflows/pull_request.yml | 2 --
 Makefile                           | 9 +++------
 web/.dockerignore                  | 3 ---
 4 files changed, 8 insertions(+), 12 deletions(-)
 delete mode 100644 web/.dockerignore

diff --git a/.dockerignore b/.dockerignore
index 9ce459f25..b22b1b536 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -9,4 +9,8 @@ core
 *.mp4
 *.jpg
 *.db
-*.ts
\ No newline at end of file
+*.ts
+
+web/dist/
+web/node_modules/
+web/.npm
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 27a3fd477..e14681a14 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -70,8 +70,6 @@ jobs:
         uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
-      - name: Create Version Module
-        run: make version
       - name: Build
         run: make
       - name: Run mypy
diff --git a/Makefile b/Makefile
index 5ca63fe33..cd3f380cc 100644
--- a/Makefile
+++ b/Makefile
@@ -8,15 +8,12 @@ CURRENT_GID := $(shell id -g)
 version:
 	echo "VERSION=\"$(VERSION)-$(COMMIT_HASH)\"" > frigate/version.py
 
+local: version
+	docker buildx build --tag frigate:latest --load .
+
 build_web:
 	docker buildx build --target web-dist --output web/dist .
 
-nginx_frigate:
-	docker buildx build --push --platform linux/arm/v7,linux/arm64/v8,linux/amd64 --tag blakeblackshear/frigate-nginx:1.0.2.nginx .
-
-local:
-	docker buildx build --tag frigate:latest .
-
 amd64:
 	docker buildx build --platform linux/amd64 --tag blakeblackshear/frigate:$(VERSION)-$(COMMIT_HASH) .
 
diff --git a/web/.dockerignore b/web/.dockerignore
deleted file mode 100644
index 8814504e3..000000000
--- a/web/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.git/
-dist/
-node_modules/