administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-02-07 03:35:26 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

check for directory first

Browse Source
This commit is contained in:
Blake Blackshear 2023-11-01 07:32:50 -05:00
parent 0d13fee9dd
commit f573d2fc28
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
docker/main/rootfs/usr/local/go2rtc/create_config.py
View File

@ -18,11 +18,12 @@ sys.path.remove("/opt/frigate")
FRIGATE_ENV_VARS = {k: v for k, v in os.environ.items() if k.startswith("FRIGATE_")} FRIGATE_ENV_VARS = {k: v for k, v in os.environ.items() if k.startswith("FRIGATE_")}
# read docker secret files as env vars too # read docker secret files as env vars too
for secret_file in os.listdir("/run/secrets"): if os.path.isdir("/run/secrets"):
if secret_file.startswith("FRIGATE_"): for secret_file in os.listdir("/run/secrets"):
FRIGATE_ENV_VARS[secret_file] = Path( if secret_file.startswith("FRIGATE_"):
os.path.join("/run/secrets", secret_file) FRIGATE_ENV_VARS[secret_file] = Path(
).read_text() os.path.join("/run/secrets", secret_file)
).read_text()
config_file = os.environ.get("CONFIG_FILE", "/config/config.yml") config_file = os.environ.get("CONFIG_FILE", "/config/config.yml")

11
frigate/config.py
View File

@ -49,11 +49,12 @@ DEFAULT_TIME_FORMAT = "%m/%d/%Y %H:%M:%S"
FRIGATE_ENV_VARS = {k: v for k, v in os.environ.items() if k.startswith("FRIGATE_")} FRIGATE_ENV_VARS = {k: v for k, v in os.environ.items() if k.startswith("FRIGATE_")}
# read docker secret files as env vars too # read docker secret files as env vars too
for secret_file in os.listdir("/run/secrets"): if os.path.isdir("/run/secrets"):
if secret_file.startswith("FRIGATE_"): for secret_file in os.listdir("/run/secrets"):
FRIGATE_ENV_VARS[secret_file] = Path( if secret_file.startswith("FRIGATE_"):
os.path.join("/run/secrets", secret_file) FRIGATE_ENV_VARS[secret_file] = Path(
).read_text() os.path.join("/run/secrets", secret_file)
).read_text()
DEFAULT_TRACKED_OBJECTS = ["person"] DEFAULT_TRACKED_OBJECTS = ["person"]
DEFAULT_LISTEN_AUDIO = ["bark", "fire_alarm", "scream", "speech", "yell"] DEFAULT_LISTEN_AUDIO = ["bark", "fire_alarm", "scream", "speech", "yell"]

4
frigate/plus.py
View File

@ -37,7 +37,9 @@ class PlusApi:
self.key = None self.key = None
if PLUS_ENV_VAR in os.environ: if PLUS_ENV_VAR in os.environ:
self.key = os.environ.get(PLUS_ENV_VAR) self.key = os.environ.get(PLUS_ENV_VAR)
elif PLUS_ENV_VAR in os.listdir("/run/secrets"): elif os.path.isdir("/run/secrets") and PLUS_ENV_VAR in os.listdir(
"/run/secrets"
):
self.key = Path(os.path.join("/run/secrets", PLUS_ENV_VAR)).read_text() self.key = Path(os.path.join("/run/secrets", PLUS_ENV_VAR)).read_text()
# check for the addon options file # check for the addon options file
elif os.path.isfile("/data/options.json"): elif os.path.isfile("/data/options.json"):