public nobgit read

NobMail

Based on mailcow: dockerized

Languages

Repository composition by tracked source files.

PHP

PHP 49% JavaScript 35% HTML 9% CSS 4% Shell 2% Python 1% Lua 0% Perl 0% Ruby 0% SCSS 0%

Create file Wiki Documentation

Clone

https://nobgit.com/orgs/nobgit/nobmail.git

ssh://[email protected]:2222/orgs/nobgit/nobmail.git

Commit

[Watchdog] Skip when use_watchdog=n

68d7fa15

andryyy <[email protected]> 9 years ago

data/Dockerfiles/watchdog/watchdog.sh | 6 ++++++
 docker-compose.yml                    | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

Diff

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: