Browse Source

[Watchdog] Skip when use_watchdog=n

andryyy 8 years ago
parent
commit
68d7fa1504
2 changed files with 7 additions and 1 deletions
  1. 6 0
      data/Dockerfiles/watchdog/watchdog.sh
  2. 1 1
      docker-compose.yml

+ 6 - 0
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

+ 1 - 1
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: