diff --git a/docker/main/rootfs/etc/s6-overlay/s6-rc.d/certsync/run b/docker/main/rootfs/etc/s6-overlay/s6-rc.d/certsync/run index 56d70640a6..235c9b3991 100755 --- a/docker/main/rootfs/etc/s6-overlay/s6-rc.d/certsync/run +++ b/docker/main/rootfs/etc/s6-overlay/s6-rc.d/certsync/run @@ -36,8 +36,8 @@ else lefile="/config/tls/fullchain.pem" fi -tls_enabled=`python3 /usr/local/nginx/get_nginx_settings.py | jq -r .tls.enabled` -listen_external_port=`python3 /usr/local/nginx/get_nginx_settings.py | jq -r .listen.external_port` +tls_enabled=`python3 -I /usr/local/nginx/get_nginx_settings.py | jq -r .tls.enabled` +listen_external_port=`python3 -I /usr/local/nginx/get_nginx_settings.py | jq -r .listen.external_port` while true do diff --git a/docker/main/rootfs/etc/s6-overlay/s6-rc.d/frigate/run b/docker/main/rootfs/etc/s6-overlay/s6-rc.d/frigate/run index fd06ecdb1d..05ca058549 100755 --- a/docker/main/rootfs/etc/s6-overlay/s6-rc.d/frigate/run +++ b/docker/main/rootfs/etc/s6-overlay/s6-rc.d/frigate/run @@ -32,9 +32,11 @@ set_libva_version # under $HOME/.local. run_as=() runtime_home="${HOME}" -if [[ "$(id -u)" -eq 0 && "$runs_as_root" -eq 0 ]]; then - run_as=(s6-setuidgid frigate) +if [[ "$runs_as_root" -eq 0 ]]; then runtime_home=/config + if [[ "$(id -u)" -eq 0 ]]; then + run_as=(s6-setuidgid frigate) + fi fi run_as+=(env "HOME=${runtime_home}" diff --git a/docker/main/rootfs/etc/s6-overlay/s6-rc.d/go2rtc/run b/docker/main/rootfs/etc/s6-overlay/s6-rc.d/go2rtc/run index 73ffc9faa5..152be1fc11 100755 --- a/docker/main/rootfs/etc/s6-overlay/s6-rc.d/go2rtc/run +++ b/docker/main/rootfs/etc/s6-overlay/s6-rc.d/go2rtc/run @@ -59,7 +59,7 @@ function get_ip_and_port_from_supervisor() { function set_libva_version() { local ffmpeg_path - ffmpeg_path=$(python3 /usr/local/ffmpeg/get_ffmpeg_path.py) + ffmpeg_path=$(python3 -I /usr/local/ffmpeg/get_ffmpeg_path.py) LIBAVFORMAT_VERSION_MAJOR=$("$ffmpeg_path" -version | grep -Po "libavformat\W+\K\d+") export LIBAVFORMAT_VERSION_MAJOR } @@ -79,7 +79,7 @@ if [[ ! -f "/dev/shm/go2rtc.yaml" ]]; then get_ip_and_port_from_supervisor fi - python3 /usr/local/go2rtc/create_config.py + python3 -I /usr/local/go2rtc/create_config.py else echo "[WARNING] Unable to remove existing go2rtc config. Changes made to your frigate config file may not be recognized. Please remove the /dev/shm/go2rtc.yaml from your docker host manually." fi @@ -87,10 +87,10 @@ fi # HomeKit persistence. The helper is symlink-safe; hand off to go2rtc only when dropping. readonly homekit_config_path="/config/go2rtc_homekit.yml" if [[ "$(id -u)" -eq 0 && "$runs_as_root" -eq 0 ]]; then - python3 /usr/local/go2rtc/prepare_homekit.py "${homekit_config_path}" --chown + python3 -I /usr/local/go2rtc/prepare_homekit.py "${homekit_config_path}" --chown chown -h go2rtc:go2rtc /dev/shm/go2rtc.yaml 2>/dev/null || true else - python3 /usr/local/go2rtc/prepare_homekit.py "${homekit_config_path}" + python3 -I /usr/local/go2rtc/prepare_homekit.py "${homekit_config_path}" fi readonly config_path="/config" diff --git a/docker/main/rootfs/etc/s6-overlay/s6-rc.d/nginx/run b/docker/main/rootfs/etc/s6-overlay/s6-rc.d/nginx/run index a4d7998b56..d7d70a15a7 100755 --- a/docker/main/rootfs/etc/s6-overlay/s6-rc.d/nginx/run +++ b/docker/main/rootfs/etc/s6-overlay/s6-rc.d/nginx/run @@ -124,7 +124,7 @@ fi mkdir -p /etc/letsencrypt/www 2>/dev/null || true # nginx settings are read once; both templates consume them -nginx_settings=$(python3 /usr/local/nginx/get_nginx_settings.py) +nginx_settings=$(python3 -I /usr/local/nginx/get_nginx_settings.py) # build templates for optional FRIGATE_BASE_PATH environment variable echo "$nginx_settings" | \