update sample config

Frigate provides an HTTP server that can be used to detect if frigate is running or not. Using the docker-compose "healthcheck" feature we can set automations to restart the service if it stops working.

Makefile

@@ -12,26 +12,26 @@ amd64_frigate:
 
 amd64_all: amd64_wheels amd64_ffmpeg amd64_frigate
 
-aarch64_wheels:
-	docker build --tag blakeblackshear/frigate-wheels:aarch64 --file docker/Dockerfile.wheels.aarch64 .
+arm64_wheels:
+	docker build --tag blakeblackshear/frigate-wheels:arm64 --file docker/Dockerfile.wheels.arm64 .
 
-aarch64_ffmpeg:
-	docker build --tag blakeblackshear/frigate-ffmpeg:aarch64 --file docker/Dockerfile.ffmpeg.aarch64 .
+arm64_ffmpeg:
+	docker build --tag blakeblackshear/frigate-ffmpeg:arm64 --file docker/Dockerfile.ffmpeg.arm64 .
 
-aarch64_frigate:
-	docker build --tag frigate-base --build-arg ARCH=aarch64 --file docker/Dockerfile.base .
-	docker build --tag frigate --file docker/Dockerfile.aarch64 .
+arm64_frigate:
+	docker build --tag frigate-base --build-arg ARCH=arm64 --file docker/Dockerfile.base .
+	docker build --tag frigate --file docker/Dockerfile.arm64 .
 
-armv7_all: armv7_wheels armv7_ffmpeg armv7_frigate
+armv7hf_all: arm64_wheels arm64_ffmpeg arm64_frigate
 
-armv7_wheels:
-	docker build --tag blakeblackshear/frigate-wheels:armv7 --file docker/Dockerfile.wheels .
+armv7hf_wheels:
+	docker build --tag blakeblackshear/frigate-wheels:armv7hf --file docker/Dockerfile.wheels .
 
-armv7_ffmpeg:
-	docker build --tag blakeblackshear/frigate-ffmpeg:armv7 --file docker/Dockerfile.ffmpeg.armv7 .
+armv7hf_ffmpeg:
+	docker build --tag blakeblackshear/frigate-ffmpeg:armv7hf --file docker/Dockerfile.ffmpeg.armv7hf .
 
-armv7_frigate:
-	docker build --tag frigate-base --build-arg ARCH=armv7 --file docker/Dockerfile.base .
-	docker build --tag frigate --file docker/Dockerfile.armv7 .
+armv7hf_frigate:
+	docker build --tag frigate-base --build-arg ARCH=armv7hf --file docker/Dockerfile.base .
+	docker build --tag frigate --file docker/Dockerfile.armv7hf .
 
-armv7_all: armv7_wheels armv7_ffmpeg armv7_frigate
+armv7hf_all: armv7hf_wheels armv7hf_ffmpeg armv7hf_frigate

README.md

@@ -31,7 +31,7 @@ docker run --rm \
 -v /etc/localtime:/etc/localtime:ro \
 -p 5000:5000 \
 -e FRIGATE_RTSP_PASSWORD='password' \
-blakeblackshear/frigate:0.7.0-amd64
+blakeblackshear/frigate:stable
 ```
 
 Example docker-compose:
@@ -41,7 +41,7 @@ Example docker-compose:
     restart: unless-stopped
     privileged: true
     shm_size: '100m' # only needed with large numbers of high res cameras
-    image: blakeblackshear/frigate:0.7.0-amd64
+    image: blakeblackshear/frigate:stable
     volumes:
       - /dev/bus/usb:/dev/bus/usb
       - /etc/localtime:/etc/localtime:ro

config/config.example.yml

@@ -31,8 +31,6 @@ save_clips:
   # will begin to expire and the resulting clip will be the last x seconds of the event.
   ###########
   max_seconds: 300
-  clips_dir: /clips
-  cache_dir: /cache
 
 #################
 # Default ffmpeg args. Optional and can be overwritten per camera.

detect_objects.py

@@ -9,7 +9,6 @@ import time
 import datetime
 import queue
 import yaml
-import json
 import threading
 import multiprocessing as mp
 import subprocess as sp
@@ -26,22 +25,8 @@ from frigate.edgetpu import EdgeTPUProcess
 
 FRIGATE_VARS = {k: v for k, v in os.environ.items() if k.startswith('FRIGATE_')}
 
-CONFIG_FILE = os.environ.get('CONFIG_FILE', '/config/config.yml')
-
-if CONFIG_FILE.endswith(".yml"):
-    with open(CONFIG_FILE) as f:
-        CONFIG = yaml.safe_load(f)
-elif CONFIG_FILE.endswith(".json"):
-    with open(CONFIG_FILE) as f:
-        CONFIG = json.load(f)
-
-CACHE_DIR = CONFIG.get('save_clips', {}).get('cache_dir', '/cache')
-CLIPS_DIR = CONFIG.get('save_clips', {}).get('clips_dir', '/clips')
-
-if not os.path.exists(CACHE_DIR) and not os.path.islink(CACHE_DIR):
-    os.makedirs(CACHE_DIR)
-if not os.path.exists(CLIPS_DIR) and not os.path.islink(CLIPS_DIR):
-    os.makedirs(CLIPS_DIR)
+with open('/config/config.yml') as f:
+    CONFIG = yaml.safe_load(f)
 
 MQTT_HOST = CONFIG['mqtt']['host']
 MQTT_PORT = CONFIG.get('mqtt', {}).get('port', 1883)
@@ -238,7 +223,7 @@ def main():
                 "-an",
                 "-map",
                 "0",
-                f"{os.path.join(CACHE_DIR, name)}-%Y%m%d%H%M%S.mp4"
+                f"/cache/{name}-%Y%m%d%H%M%S.mp4"
             ] + ffmpeg_output_args
         ffmpeg_cmd = (['ffmpeg'] +
                 ffmpeg_global_args +
@@ -304,7 +289,7 @@ def main():
         camera_process['process'].start()
         print(f"Camera_process started for {name}: {camera_process['process'].pid}")
 
-    event_processor = EventProcessor(CONFIG, camera_processes, CACHE_DIR, CLIPS_DIR, event_queue, stop_event)
+    event_processor = EventProcessor(CONFIG, camera_processes, '/cache', '/clips', event_queue, stop_event)
     event_processor.start()
     
     object_processor = TrackedObjectProcessor(CONFIG['cameras'], client, MQTT_TOPIC_PREFIX, tracked_objects_queue, event_queue, stop_event)