Merge pull request #2829 from blakeblackshear/release-0.11.0

Release 0.11.0

.devcontainer/devcontainer.json

@@ -9,19 +9,32 @@
     "mhutchie.git-graph",
     "ms-azuretools.vscode-docker",
     "streetsidesoftware.code-spell-checker",
-    "eamodio.gitlens",
     "esbenp.prettier-vscode",
-    "ms-python.vscode-pylance"
+    "ms-python.vscode-pylance",
+    "dbaeumer.vscode-eslint",
+    "mikestead.dotenv",
+    "csstools.postcss",
+    "blanu.vscode-styled-jsx",
+    "bradlc.vscode-tailwindcss"
   ],
   "settings": {
-    "python.pythonPath": "/usr/bin/python3",
     "python.linting.pylintEnabled": true,
     "python.linting.enabled": true,
     "python.formatting.provider": "black",
+    "python.languageServer": "Pylance",
     "editor.formatOnPaste": false,
     "editor.formatOnSave": true,
     "editor.formatOnType": true,
     "files.trimTrailingWhitespace": true,
-    "terminal.integrated.shell.linux": "/bin/bash"
+    "eslint.workingDirectories": ["./web"],
+    "[json][jsonc]": {
+      "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+    "[jsx][js][tsx][ts]": {
+      "editor.codeActionsOnSave": ["source.addMissingImports", "source.fixAll"],
+      "editor.tabSize": 2
+    },
+    "cSpell.ignoreWords": ["rtmp"],
+    "cSpell.words": ["preact"]
   }
 }

.dockerignore

@@ -7,5 +7,6 @@ config/
 .git
 core
 *.mp4
+*.jpg
 *.db
 *.ts

.github/workflows/pull_request.yml

@@ -2,6 +2,9 @@ name: On pull request
 
 on: pull_request
 
+env:
+  DEFAULT_PYTHON: 3.9
+
 jobs:
   web_lint:
     name: Web - Lint
@@ -10,25 +13,11 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 14.x
+          node-version: 16.x
       - run: npm install
         working-directory: ./web
       - name: Lint
-        run: npm run lint:cmd
-        working-directory: ./web
-
-  web_build:
-    name: Web - Build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@master
-      - uses: actions/setup-node@master
-        with:
-          node-version: 14.x
-      - run: npm install
-        working-directory: ./web
-      - name: Build
-        run: npm run build
+        run: npm run lint
         working-directory: ./web
 
   web_test:
@@ -38,33 +27,54 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-node@master
         with:
-          node-version: 14.x
+          node-version: 16.x
       - run: npm install
         working-directory: ./web
       - name: Test
         run: npm run test
         working-directory: ./web
-        
-  docker_tests_on_aarch64:
+
+  python_checks:
     runs-on: ubuntu-latest
+    name: Python checks
     steps:
-      - name: Check out code
-        uses: actions/checkout@v2
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      - 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"
+      - name: Check out the repository
+        uses: actions/checkout@v2.3.4
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
+        uses: actions/setup-python@v2.2.2
+        with:
+          python-version: ${{ env.DEFAULT_PYTHON }}
+      - name: Install requirements
+        run: |
+          pip install pip
+          pip install -r requirements-dev.txt
+      - name: Lint
+        run: |
+          python3 -m black frigate --check
 
-  docker_tests_on_amd64:
+  python_tests:
     runs-on: ubuntu-latest
+    name: Python Tests
     steps:
       - name: Check out code
         uses: actions/checkout@v2
+      - uses: actions/setup-node@master
+        with:
+          node-version: 16.x
+      - run: npm install
+        working-directory: ./web
+      - name: Build web
+        run: npm run build
+        working-directory: ./web
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
       - 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"
+      - name: Create Version Module
+        run: make version
+      - name: Build
+        run: make
+      - name: Run mypy
+        run: docker run --rm --entrypoint=python3 frigate:latest -u -m mypy --config-file frigate/mypy.ini frigate
+      - name: Run tests
+        run: docker run --rm --entrypoint=python3 frigate:latest -u -m unittest

.gitignore

@@ -14,3 +14,4 @@ web/build
 web/node_modules
 web/coverage
 core
+!/web/**/*.ts

Makefile

@@ -1,74 +1,39 @@
-default_target: amd64_frigate
+default_target: local
 
 COMMIT_HASH := $(shell git log -1 --pretty=format:"%h"|tail -1)
+VERSION = 0.11.0
+CURRENT_UID := $(shell id -u)
+CURRENT_GID := $(shell id -g)
 
 version:
-	echo "VERSION='0.10.1-$(COMMIT_HASH)'" > frigate/version.py
+	echo "VERSION=\"$(VERSION)-$(COMMIT_HASH)\"" > frigate/version.py
 
-web:
-	docker build --tag frigate-web --file docker/Dockerfile.web web/
-
-amd64_wheels:
-	docker build --tag blakeblackshear/frigate-wheels:1.0.3-amd64 --file docker/Dockerfile.wheels .
-
-amd64_ffmpeg:
-	docker build --no-cache --pull --tag blakeblackshear/frigate-ffmpeg:1.2.0-amd64 --file docker/Dockerfile.ffmpeg.amd64 .
+build_web:
+	docker run --volume ${PWD}/web:/web -w /web --volume /etc/passwd:/etc/passwd:ro --volume /etc/group:/etc/group:ro -u $(CURRENT_UID):$(CURRENT_GID) node:16 /bin/bash -c "npm install && npm run build"
 
 nginx_frigate:
 	docker buildx build --push --platform linux/arm/v7,linux/arm64/v8,linux/amd64 --tag blakeblackshear/frigate-nginx:1.0.2 --file docker/Dockerfile.nginx .
 
-amd64_frigate: version web
-	docker build --no-cache --tag frigate-base --build-arg ARCH=amd64 --build-arg FFMPEG_VERSION=1.1.0 --build-arg WHEELS_VERSION=1.0.3 --build-arg NGINX_VERSION=1.0.2 --file docker/Dockerfile.base .
-	docker build --no-cache --tag frigate --file docker/Dockerfile.amd64 .
-
-amd64_all: amd64_wheels amd64_ffmpeg amd64_frigate
-
-amd64nvidia_wheels:
-	docker build --tag blakeblackshear/frigate-wheels:1.0.3-amd64nvidia --file docker/Dockerfile.wheels .
-
-amd64nvidia_ffmpeg:
-	docker build --no-cache --pull --tag blakeblackshear/frigate-ffmpeg:1.2.0-amd64nvidia --file docker/Dockerfile.ffmpeg.amd64nvidia .
-
-amd64nvidia_frigate: version web
-	docker build --no-cache --tag frigate-base --build-arg ARCH=amd64nvidia --build-arg FFMPEG_VERSION=1.0.0 --build-arg WHEELS_VERSION=1.0.3 --build-arg NGINX_VERSION=1.0.2 --file docker/Dockerfile.base .
-	docker build --no-cache --tag frigate --file docker/Dockerfile.amd64nvidia .
-
-amd64nvidia_all: amd64nvidia_wheels amd64nvidia_ffmpeg amd64nvidia_frigate
-
-aarch64_wheels:
-	docker build --tag blakeblackshear/frigate-wheels:1.0.3-aarch64 --file docker/Dockerfile.wheels .
-
-aarch64_ffmpeg:
-	docker build --no-cache --pull --tag blakeblackshear/frigate-ffmpeg:1.3.0-aarch64 --file docker/Dockerfile.ffmpeg.aarch64 .
-
-aarch64_frigate: version web
-	docker build --no-cache --tag frigate-base --build-arg ARCH=aarch64 --build-arg FFMPEG_VERSION=1.0.0 --build-arg WHEELS_VERSION=1.0.3 --build-arg NGINX_VERSION=1.0.2 --file docker/Dockerfile.base .
-	docker build --no-cache --tag frigate --file docker/Dockerfile.aarch64 .
+local:
+	DOCKER_BUILDKIT=1 docker build -t frigate -f docker/Dockerfile .
 
-aarch64_all: aarch64_wheels aarch64_ffmpeg aarch64_frigate
+amd64:
+	docker buildx build --platform linux/amd64 --tag blakeblackshear/frigate:$(VERSION)-$(COMMIT_HASH) --file docker/Dockerfile .
 
-armv7_wheels:
-	docker build --tag blakeblackshear/frigate-wheels:1.0.3-armv7 --file docker/Dockerfile.wheels .
+arm64:
+	docker buildx build --platform linux/arm64 --tag blakeblackshear/frigate:$(VERSION)-$(COMMIT_HASH) --file docker/Dockerfile .
 
-armv7_ffmpeg:
-	docker build --no-cache --pull --tag blakeblackshear/frigate-ffmpeg:1.2.0-armv7 --file docker/Dockerfile.ffmpeg.armv7 .
+armv7:
+	docker buildx build --platform linux/arm/v7 --tag blakeblackshear/frigate:$(VERSION)-$(COMMIT_HASH) --file docker/Dockerfile .
 
-armv7_frigate: version web
-	docker build --no-cache --tag frigate-base --build-arg ARCH=armv7 --build-arg FFMPEG_VERSION=1.0.0 --build-arg WHEELS_VERSION=1.0.3 --build-arg NGINX_VERSION=1.0.2 --file docker/Dockerfile.base .
-	docker build --no-cache --tag frigate --file docker/Dockerfile.armv7 .
+build: version amd64 arm64 armv7
+	docker buildx build --platform linux/arm/v7,linux/arm64/v8,linux/amd64 --tag blakeblackshear/frigate:$(VERSION)-$(COMMIT_HASH) --file docker/Dockerfile .
 
-armv7_all: armv7_wheels armv7_ffmpeg armv7_frigate
+push: build
+	docker buildx build --push --platform linux/arm/v7,linux/arm64/v8,linux/amd64 --tag blakeblackshear/frigate:$(VERSION)-$(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 WHEELS_VERSION=1.0.3 --file docker/Dockerfile.test .
-	@rm docker/Dockerfile.test
+run_tests: frigate
+	docker run --rm --entrypoint=python3 frigate:latest -u -m unittest
+	docker run --rm --entrypoint=python3 frigate:latest -u -m mypy --config-file frigate/mypy.ini frigate
 
-.PHONY: web run_tests
+.PHONY: run_tests

docker-compose.yml

@@ -3,20 +3,28 @@ services:
   dev:
     container_name: frigate-dev
     user: vscode
-    privileged: true
+    # add groups from host for render, plugdev, video
+    group_add:
+      - "109" # render
+      - "110" # render
+      - "44"  # video
+      - "46"  # plugdev
     shm_size: "256mb"
     build:
       context: .
       dockerfile: docker/Dockerfile.dev
+    devices:
+      - /dev/bus/usb:/dev/bus/usb
+      - /dev/dri:/dev/dri # for intel hwaccel, needs to be updated for your hardware
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - .:/lab/frigate:cached
       - ./config/config.yml:/config/config.yml:ro
       - ./debug:/media/frigate
       - /dev/bus/usb:/dev/bus/usb
-      - /dev/dri:/dev/dri # for intel hwaccel, needs to be updated for your hardware
     ports:
       - "1935:1935"
+      - "3000:3000"
       - "5000:5000"
       - "5001:5001"
       - "8080:8080"