Fix merge

This commit is contained in:
Nick Mowen 2022-12-07 08:08:49 -07:00
parent d0c40937d1
commit 28b5327343
5 changed files with 6 additions and 6 deletions

View File

@ -8,4 +8,4 @@ dirs=(/dev/shm/logs/frigate /dev/shm/logs/go2rtc /dev/shm/logs/nginx)
mkdir -p "${dirs[@]}" mkdir -p "${dirs[@]}"
chown nobody:nogroup "${dirs[@]}" chown nobody:nogroup "${dirs[@]}"
chmod 02755 "${dirs[@]}" chmod 02755 "${dirs[@]}"

View File

@ -13,4 +13,4 @@ fi
# Make the container exit with the same exit code as the service # Make the container exit with the same exit code as the service
echo "${exit_code}" > /run/s6-linux-init-container-results/exitcode echo "${exit_code}" > /run/s6-linux-init-container-results/exitcode
exec /run/s6/basedir/bin/halt exec /run/s6/basedir/bin/halt

View File

@ -1,4 +1,4 @@
#!/bin/bash #!/command/with-contenv bash
# shellcheck shell=bash # shellcheck shell=bash
# Start the Frigate service # Start the Frigate service
@ -8,4 +8,4 @@ cd /opt/frigate
# Replace the bash process with the Frigate process, redirecting stderr to stdout # Replace the bash process with the Frigate process, redirecting stderr to stdout
exec 2>&1 exec 2>&1
exec python3 -u -m frigate exec python3 -u -m frigate

View File

@ -12,4 +12,4 @@ fi
# Replace the bash process with the go2rtc process, redirecting stderr to stdout # Replace the bash process with the go2rtc process, redirecting stderr to stdout
exec 2>&1 exec 2>&1
exec go2rtc -config="${config_path}" exec go2rtc -config="${config_path}"

View File

@ -4,4 +4,4 @@
# Replace the bash process with the NGINX process, redirecting stderr to stdout # Replace the bash process with the NGINX process, redirecting stderr to stdout
exec 2>&1 exec 2>&1
exec nginx exec nginx