Merge pull request #6262 from blakeblackshear/dev

0.13.0 Release

.devcontainer/devcontainer.json

@@ -37,42 +37,57 @@
  "onAutoForward": "silent"
  }
  },
- "extensions": [
- "ms-python.vscode-pylance",
- "ms-python.python",
- "visualstudioexptteam.vscodeintellicode",
- "mhutchie.git-graph",
- "ms-azuretools.vscode-docker",
- "streetsidesoftware.code-spell-checker",
- "esbenp.prettier-vscode",
- "dbaeumer.vscode-eslint",
- "mikestead.dotenv",
- "csstools.postcss",
- "blanu.vscode-styled-jsx",
- "bradlc.vscode-tailwindcss"
- ],
- "settings": {
- "remote.autoForwardPorts": false,
- "python.linting.pylintEnabled": true,
- "python.linting.enabled": true,
- "python.formatting.provider": "black",
- "python.languageServer": "Pylance",
- "editor.formatOnPaste": false,
- "editor.formatOnSave": true,
- "editor.formatOnType": true,
- "python.testing.pytestEnabled": false,
- "python.testing.unittestEnabled": true,
- "python.testing.unittestArgs": ["-v", "-s", "./frigate/test"],
- "files.trimTrailingWhitespace": true,
- "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"]
+ "customizations": {
+ "vscode": {
+ "extensions": [
+ "ms-python.python",
+ "ms-python.vscode-pylance",
+ "visualstudioexptteam.vscodeintellicode",
+ "mhutchie.git-graph",
+ "ms-azuretools.vscode-docker",
+ "streetsidesoftware.code-spell-checker",
+ "esbenp.prettier-vscode",
+ "dbaeumer.vscode-eslint",
+ "mikestead.dotenv",
+ "csstools.postcss",
+ "blanu.vscode-styled-jsx",
+ "bradlc.vscode-tailwindcss",
+ "charliermarsh.ruff"
+ ],
+ "settings": {
+ "remote.autoForwardPorts": false,
+ "python.formatting.provider": "none",
+ "python.languageServer": "Pylance",
+ "editor.formatOnPaste": false,
+ "editor.formatOnSave": true,
+ "editor.formatOnType": true,
+ "python.testing.pytestEnabled": false,
+ "python.testing.unittestEnabled": true,
+ "python.testing.unittestArgs": ["-v", "-s", "./frigate/test"],
+ "files.trimTrailingWhitespace": true,
+ "eslint.workingDirectories": ["./web"],
+ "isort.args": ["--settings-path=./pyproject.toml"],
+ "[python]": {
+ "editor.defaultFormatter": "charliermarsh.ruff",
+ "editor.formatOnSave": true,
+ "editor.codeActionsOnSave": {
+ "source.fixAll": true,
+ "source.organizeImports": true
+ }
+ },
+ "[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", "astype", "hwaccel", "mqtt"]
+ }
+ }
  }
 }

.devcontainer/post_create.sh

@@ -2,12 +2,23 @@
 
 set -euxo pipefail
 
+# Cleanup the old github host key
+sed -i -e '/AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31\/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi\/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==/d' ~/.ssh/known_hosts
+# Add new github host key
+curl -L https://api.github.com/meta | jq -r '.ssh_keys | .[]' | \
+ sed -e 's/^/github.com /' >> ~/.ssh/known_hosts
+
 # Frigate normal container runs as root, so it have permission to create
 # the folders. But the devcontainer runs as the host user, so we need to
 # create the folders and give the host user permission to write to them.
 sudo mkdir -p /media/frigate
 sudo chown -R "$(id -u):$(id -g)" /media/frigate
 
+# When started as a service, LIBAVFORMAT_VERSION_MAJOR is defined in the
+# s6 service file. For dev, where frigate is started from an interactive
+# shell, we define it in .bashrc instead.
+echo 'export LIBAVFORMAT_VERSION_MAJOR=$(ffmpeg -version | grep -Po "libavformat\W+\K\d+")' >> $HOME/.bashrc
+
 make version
 
 cd web

.github/actions/setup/action.yml

@@ -0,0 +1,39 @@
+name: 'Setup'
+description: 'Set up QEMU and Buildx'
+inputs:
+ GITHUB_TOKEN:
+ required: true
+outputs:
+ image-name:
+ value: ghcr.io/${{ steps.lowercaseRepo.outputs.lowercase }}:${{ github.ref_name }}-${{ steps.create-short-sha.outputs.SHORT_SHA }}
+ cache-name:
+ value: ghcr.io/${{ steps.lowercaseRepo.outputs.lowercase }}:cache
+runs:
+ using: "composite"
+ steps:
+ - name: Remove unnecessary files
+ run: |
+ sudo rm -rf /usr/share/dotnet
+ sudo rm -rf /usr/local/lib/android
+ sudo rm -rf /opt/ghc
+ shell: bash
+ - id: lowercaseRepo
+ uses: ASzc/change-string-case-action@v5
+ with:
+ string: ${{ github.repository }}
+ - name: Set up QEMU
+ uses: docker/setup-qemu-action@v2
+ - name: Set up Docker Buildx
+ uses: docker/setup-buildx-action@v2
+ - name: Log in to the Container registry
+ uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc
+ with:
+ registry: ghcr.io
+ username: ${{ github.actor }}
+ password: ${{ inputs.GITHUB_TOKEN }}
+ - name: Create version file
+ run: make version
+ shell: bash
+ - id: create-short-sha
+ run: echo "SHORT_SHA=${GITHUB_SHA::7}" >> $GITHUB_OUTPUT
+ shell: bash

.github/dependabot.yml

@@ -13,7 +13,13 @@ updates:
  open-pull-requests-limit: 10
  target-branch: dev
  - package-ecosystem: "pip"
- directory: "/"
+ directory: "/docker/main"
+ schedule:
+ interval: daily
+ open-pull-requests-limit: 10
+ target-branch: dev
+ - package-ecosystem: "pip"
+ directory: "/docker/tensorrt"
  schedule:
  interval: daily
  open-pull-requests-limit: 10

.github/workflows/ci.yml

@@ -1,6 +1,7 @@
 name: CI
 
 on:
+ workflow_dispatch:
  push:
  branches:
  - dev
@@ -15,53 +16,154 @@ env:
  PYTHON_VERSION: 3.9
 
 jobs:
- multi_arch_build:
+ amd64_build:
  runs-on: ubuntu-latest
- name: Image Build
+ name: AMD64 Build
+ steps:
+ - name: Check out code
+ uses: actions/checkout@v4
+ - name: Set up QEMU and Buildx
+ id: setup
+ uses: ./.github/actions/setup
+ with:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ - name: Build and push amd64 standard build
+ uses: docker/build-push-action@v5
+ with:
+ context: .
+ file: docker/main/Dockerfile
+ push: true
+ platforms: linux/amd64
+ target: frigate
+ tags: ${{ steps.setup.outputs.image-name }}-amd64
+ cache-from: type=registry,ref=${{ steps.setup.outputs.cache-name }}-amd64
+ - name: Build and push TensorRT (x86 GPU)
+ uses: docker/bake-action@v4
+ with:
+ push: true
+ targets: tensorrt
+ files: docker/tensorrt/trt.hcl
+ set: |
+ tensorrt.tags=${{ steps.setup.outputs.image-name }}-tensorrt
+ *.cache-from=type=registry,ref=${{ steps.setup.outputs.cache-name }}-amd64
+ *.cache-to=type=registry,ref=${{ steps.setup.outputs.cache-name }}-amd64,mode=max
+ arm64_build:
+ runs-on: ubuntu-latest
+ name: ARM Build
+ steps:
+ - name: Check out code
+ uses: actions/checkout@v4
+ - name: Set up QEMU and Buildx
+ id: setup
+ uses: ./.github/actions/setup
+ with:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ - name: Build and push arm64 standard build
+ uses: docker/build-push-action@v5
+ with:
+ context: .
+ file: docker/main/Dockerfile
+ push: true
+ platforms: linux/arm64
+ target: frigate
+ tags: |
+ ${{ steps.setup.outputs.image-name }}-standard-arm64
+ cache-from: type=registry,ref=${{ steps.setup.outputs.cache-name }}-arm64
+ - name: Build and push RPi build
+ uses: docker/bake-action@v4
+ with:
+ push: true
+ targets: rpi
+ files: docker/rpi/rpi.hcl
+ set: |
+ rpi.tags=${{ steps.setup.outputs.image-name }}-rpi
+ *.cache-from=type=registry,ref=${{ steps.setup.outputs.cache-name }}-arm64
+ *.cache-to=type=registry,ref=${{ steps.setup.outputs.cache-name }}-arm64,mode=max
+ - name: Build and push RockChip build
+ uses: docker/bake-action@v3
+ with:
+ push: true
+ targets: rk
+ files: docker/rockchip/rk.hcl
+ set: |
+ rk.tags=${{ steps.setup.outputs.image-name }}-rk
+ *.cache-from=type=gha
+ jetson_jp4_build:
+ runs-on: ubuntu-latest
+ name: Jetson Jetpack 4
+ steps:
+ - name: Check out code
+ uses: actions/checkout@v4
+ - name: Set up QEMU and Buildx
+ id: setup
+ uses: ./.github/actions/setup
+ with:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ - name: Build and push TensorRT (Jetson, Jetpack 4)
+ env:
+ ARCH: arm64
+ BASE_IMAGE: timongentzsch/l4t-ubuntu20-opencv:latest
+ SLIM_BASE: timongentzsch/l4t-ubuntu20-opencv:latest
+ TRT_BASE: timongentzsch/l4t-ubuntu20-opencv:latest
+ uses: docker/bake-action@v4
+ with:
+ push: true
+ targets: tensorrt
+ files: docker/tensorrt/trt.hcl
+ set: |
+ tensorrt.tags=${{ steps.setup.outputs.image-name }}-tensorrt-jp4
+ *.cache-from=type=registry,ref=${{ steps.setup.outputs.cache-name }}-jp4
+ *.cache-to=type=registry,ref=${{ steps.setup.outputs.cache-name }}-jp4,mode=max
+ jetson_jp5_build:
+ runs-on: ubuntu-latest
+ name: Jetson Jetpack 5
+ steps:
+ - name: Check out code
+ uses: actions/checkout@v4
+ - name: Set up QEMU and Buildx
+ id: setup
+ uses: ./.github/actions/setup
+ with:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ - name: Build and push TensorRT (Jetson, Jetpack 5)
+ env:
+ ARCH: arm64
+ BASE_IMAGE: nvcr.io/nvidia/l4t-tensorrt:r8.5.2-runtime
+ SLIM_BASE: nvcr.io/nvidia/l4t-tensorrt:r8.5.2-runtime
+ TRT_BASE: nvcr.io/nvidia/l4t-tensorrt:r8.5.2-runtime
+ uses: docker/bake-action@v4
+ with:
+ push: true
+ targets: tensorrt
+ files: docker/tensorrt/trt.hcl
+ set: |
+ tensorrt.tags=${{ steps.setup.outputs.image-name }}-tensorrt-jp5
+ *.cache-from=type=registry,ref=${{ steps.setup.outputs.cache-name }}-jp5
+ *.cache-to=type=registry,ref=${{ steps.setup.outputs.cache-name }}-jp5,mode=max
+ # The majority of users running arm64 are rpi users, so the rpi
+ # build should be the primary arm64 image
+ assemble_default_build:
+ runs-on: ubuntu-latest
+ name: Assemble and push default build
+ needs:
+ - amd64_build
+ - arm64_build
  steps:
- - name: Remove unnecessary files
- run: |
- sudo rm -rf /usr/share/dotnet
- sudo rm -rf /usr/local/lib/android
- sudo rm -rf /opt/ghc
  - id: lowercaseRepo
- uses: ASzc/change-string-case-action@v5
+ uses: ASzc/change-string-case-action@v6
  with:
  string: ${{ github.repository }}
- - name: Check out code
- uses: actions/checkout@v3
- - name: Set up QEMU
- uses: docker/setup-qemu-action@v2
- - name: Set up Docker Buildx
- uses: docker/setup-buildx-action@v2
  - name: Log in to the Container registry
- uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
+ uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d
  with:
  registry: ghcr.io
  username: ${{ github.actor }}
  password: ${{ secrets.GITHUB_TOKEN }}
- - name: Create version file
- run: make version
  - name: Create short sha
  run: echo "SHORT_SHA=${GITHUB_SHA::7}" >> $GITHUB_ENV
- - name: Build and push
- uses: docker/build-push-action@v3
+ - uses: int128/docker-manifest-create-action@v1
  with:
- context: .
- push: true
- platforms: linux/amd64,linux/arm64,linux/arm/v7
- target: frigate
- tags: |
- ghcr.io/${{ steps.lowercaseRepo.outputs.lowercase }}:${{ github.ref_name }}-${{ env.SHORT_SHA }}
- cache-from: type=gha
- cache-to: type=gha,mode=max
- - name: Build and push TensorRT
- uses: docker/build-push-action@v3
- with:
- context: .
- push: true
- platforms: linux/amd64
- target: frigate-tensorrt
- tags: |
- ghcr.io/${{ steps.lowercaseRepo.outputs.lowercase }}:${{ github.ref_name }}-${{ env.SHORT_SHA }}-tensorrt
- cache-from: type=gha
+ tags: ghcr.io/${{ steps.lowercaseRepo.outputs.lowercase }}:${{ github.ref_name }}-${{ env.SHORT_SHA }}
+ suffixes: |
+ -amd64
+ -rpi

.github/workflows/dependabot-auto-merge.yaml

@@ -16,7 +16,9 @@ jobs:
  github-token: ${{ secrets.GITHUB_TOKEN }}
  - name: Enable auto-merge for Dependabot PRs
  if: steps.metadata.outputs.dependency-type == 'direct:development' && (steps.metadata.outputs.update-type == 'version-update:semver-minor' || steps.metadata.outputs.update-type == 'version-update:semver-patch')
- run: gh pr merge --auto --squash "$PR_URL"
+ run: |
+ gh pr review --approve "$PR_URL"
+ gh pr merge --auto --squash "$PR_URL"
  env:
  PR_URL: ${{ github.event.pull_request.html_url }}
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}