From 633d8d214d1f3fabdd6d83646e9ffadc9dc82b31 Mon Sep 17 00:00:00 2001
From: Felipe Santos <felipecassiors@gmail.com>
Date: Mon, 14 Nov 2022 14:24:23 -0300
Subject: [PATCH] Use CMD again

---
 docker/Dockerfile                           |  5 ++++-
 docker/rootfs/etc/services.d/frigate/finish | 12 ------------
 docker/rootfs/etc/services.d/frigate/run    |  9 ---------
 docker/rootfs/etc/services.d/go2rtc/finish  |  4 ++--
 docker/rootfs/etc/services.d/nginx/finish   |  4 ++--
 5 files changed, 8 insertions(+), 26 deletions(-)
 delete mode 100755 docker/rootfs/etc/services.d/frigate/finish
 delete mode 100755 docker/rootfs/etc/services.d/frigate/run

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 8f45940ce..f5750ddfa 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -62,7 +62,8 @@ ENV FLASK_ENV=development
 ENV S6_SERVICES_READYTIME=50
 
 # https://github.com/hassio-addons/addon-debian-base/pull/126
-RUN rm -f /etc/cont-init.d/00-banner.sh /etc/cont-init.d/01-log-level.sh
+# https://github.com/hassio-addons/addon-debian-base/pull/127
+RUN rm -f /etc/cont-init.d/*
 
 COPY --from=wheels /wheels /wheels
 
@@ -156,3 +157,5 @@ EXPOSE 5000
 EXPOSE 1935
 EXPOSE 8554
 EXPOSE 8555
+
+CMD ["python3", "-u", "-m", "frigate"]
diff --git a/docker/rootfs/etc/services.d/frigate/finish b/docker/rootfs/etc/services.d/frigate/finish
deleted file mode 100755
index 9c2e8a52a..000000000
--- a/docker/rootfs/etc/services.d/frigate/finish
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/command/with-contenv bashio
-# ==============================================================================
-# Take down the S6 supervision tree when Frigate fails
-# ==============================================================================
-# shellcheck shell=bash
-
-if [[ "${1}" -ne 0 ]] && [[ "${1}" -ne 256 ]]; then
-    bashio::log.warning "Frigate crashed, halting container..."
-    /run/s6/basedir/bin/halt
-fi
-
-bashio::log.info "Frigate stopped, restarting..."
diff --git a/docker/rootfs/etc/services.d/frigate/run b/docker/rootfs/etc/services.d/frigate/run
deleted file mode 100755
index f71b736f9..000000000
--- a/docker/rootfs/etc/services.d/frigate/run
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/command/with-contenv bashio
-# ==============================================================================
-# Runs Frigate
-# ==============================================================================
-# shellcheck shell=bash
-
-bashio::log.info 'Starting Frigate...'
-
-exec python3 -u -m frigate
diff --git a/docker/rootfs/etc/services.d/go2rtc/finish b/docker/rootfs/etc/services.d/go2rtc/finish
index 0306719cf..497012741 100755
--- a/docker/rootfs/etc/services.d/go2rtc/finish
+++ b/docker/rootfs/etc/services.d/go2rtc/finish
@@ -7,6 +7,6 @@
 if [[ "${1}" -ne 0 ]] && [[ "${1}" -ne 256 ]]; then
     bashio::log.warning "go2rtc crashed, halting container..."
     /run/s6/basedir/bin/halt
+else
+    bashio::log.info "go2rtc stopped, restarting..."
 fi
-
-bashio::log.info "go2rtc stopped, restarting..."
diff --git a/docker/rootfs/etc/services.d/nginx/finish b/docker/rootfs/etc/services.d/nginx/finish
index cf73cfc91..f7343b8b5 100755
--- a/docker/rootfs/etc/services.d/nginx/finish
+++ b/docker/rootfs/etc/services.d/nginx/finish
@@ -7,6 +7,6 @@
 if [[ "${1}" -ne 0 ]] && [[ "${1}" -ne 256 ]]; then
     bashio::log.warning "NGINX crashed, halting container..."
     /run/s6/basedir/bin/halt
+else
+    bashio::log.info "NGINX stopped, restarting..."
 fi
-
-bashio::log.info "NGINX stopped, restarting..."