diff --git a/data/Dockerfiles/watchdog/watchdog.sh b/data/Dockerfiles/watchdog/watchdog.sh index b02e19c8..5c486b15 100755 --- a/data/Dockerfiles/watchdog/watchdog.sh +++ b/data/Dockerfiles/watchdog/watchdog.sh @@ -7,6 +7,12 @@ PARENT_PID=$$ # Prepare BACKGROUND_TASKS=() +if [[ "${USE_WATCHDOG}" =~ ^([nN][oO]|[nN])+$ ]]; then + log_f "USE_WATCHDOG=n, skipping watchdog..." + sleep 365d + exec $(readlink -f "$0") +fi + # Checks pipe their corresponding container name in this pipe if [[ ! -p /tmp/com_pipe ]]; then mkfifo /tmp/com_pipe diff --git a/docker-compose.yml b/docker-compose.yml index fb74337d..0be95fca 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -296,7 +296,7 @@ services: - /lib/modules:/lib/modules:ro watchdog-mailcow: - image: mailcow/watchdog:1.2 + image: mailcow/watchdog:1.3 build: ./data/Dockerfiles/watchdog init: false volumes: