diff --git a/Dockerfile b/Dockerfile index 2a7c61c5e..4aa0a4da0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -192,8 +192,9 @@ CMD [] # Frigate deps with Node.js and NPM for devcontainer FROM deps AS devcontainer -# Do not start frigate on devcontainer -RUN rm -rf /etc/services.d/frigate +# Do not start the actual Frigate service on devcontainer as it will be started by VSCode +# But start a fake service for simulating the logs +COPY docker/fake_frigate_run /etc/services.d/frigate/run # Install Node 16 RUN apt-get update \ diff --git a/docker/fake_frigate_run b/docker/fake_frigate_run new file mode 100755 index 000000000..677bb98cf --- /dev/null +++ b/docker/fake_frigate_run @@ -0,0 +1,8 @@ +#!/bin/bash +# shellcheck shell=bash +# Start the fake Frigate service + +while true; do + echo "The fake Frigate service is running..." + sleep 5s +done diff --git a/docker/rootfs/etc/cont-init.d/prepare-logs.sh b/docker/rootfs/etc/cont-init.d/prepare-logs.sh index 51c5ec55d..2cad35bcf 100755 --- a/docker/rootfs/etc/cont-init.d/prepare-logs.sh +++ b/docker/rootfs/etc/cont-init.d/prepare-logs.sh @@ -4,6 +4,9 @@ set -o errexit -o nounset -o pipefail -mkdir -p /dev/shm/logs -chown nobody:nogroup /dev/shm/logs -chmod 02755 /dev/shm/logs + +dirs=(/dev/shm/logs/frigate /dev/shm/logs/go2rtc /dev/shm/logs/nginx) + +mkdir -p "${dirs[@]}" +chown nobody:nogroup "${dirs[@]}" +chmod 02755 "${dirs[@]}" diff --git a/docker/rootfs/etc/services.d/frigate/run b/docker/rootfs/etc/services.d/frigate/run index 704ac1922..2ef85dc0f 100755 --- a/docker/rootfs/etc/services.d/frigate/run +++ b/docker/rootfs/etc/services.d/frigate/run @@ -2,7 +2,7 @@ # shellcheck shell=bash # Start the Frigate service -set -o errexit -o nounset -o pipefail -o xtrace +set -o errexit -o nounset -o pipefail cd /opt/frigate