From e28a1766391183151464b2ba12482443dae2cf59 Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Sun, 8 Mar 2020 20:23:32 +0100
Subject: [PATCH] [ACME, Watchdog] Improve waiting for Redis

---
 data/Dockerfiles/acme/acme.sh         |  5 +++++
 data/Dockerfiles/watchdog/watchdog.sh | 10 +++++-----
 docker-compose.yml                    |  4 ++--
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/data/Dockerfiles/acme/acme.sh b/data/Dockerfiles/acme/acme.sh
index 0b0eadb1..30304bc1 100755
--- a/data/Dockerfiles/acme/acme.sh
+++ b/data/Dockerfiles/acme/acme.sh
@@ -9,6 +9,11 @@ else
   export REDIS_CMDLINE="redis-cli -h redis -p 6379"
 fi
 
+until [[ $(${REDIS_CMDLINE} PING) == "PONG" ]]; do
+  echo "Waiting for Redis..."
+  sleep 2
+done
+
 source /srv/functions.sh
 # Thanks to https://github.com/cvmiller -> https://github.com/cvmiller/expand6
 source /srv/expand6.sh
diff --git a/data/Dockerfiles/watchdog/watchdog.sh b/data/Dockerfiles/watchdog/watchdog.sh
index 60222bf8..f4442f30 100755
--- a/data/Dockerfiles/watchdog/watchdog.sh
+++ b/data/Dockerfiles/watchdog/watchdog.sh
@@ -25,11 +25,6 @@ while ! mysqladmin status --socket=/var/run/mysqld/mysqld.sock -u${DBUSER} -p${D
   sleep 2
 done
 
-until [[ $(redis-cli -h redis-mailcow PING) == "PONG" ]]; do
-  echo "Waiting for Redis..."
-  sleep 2
-done
-
 # Do not attempt to write to slave
 if [[ ! -z ${REDIS_SLAVEOF_IP} ]]; then
   REDIS_CMDLINE="redis-cli -h ${REDIS_SLAVEOF_IP} -p ${REDIS_SLAVEOF_PORT}"
@@ -37,6 +32,11 @@ else
   REDIS_CMDLINE="redis-cli -h redis -p 6379"
 fi
 
+until [[ $(${REDIS_CMDLINE} PING) == "PONG" ]]; do
+  echo "Waiting for Redis..."
+  sleep 2
+done
+
 ${REDIS_CMDLINE} DEL F2B_RES > /dev/null
 
 # Common functions
diff --git a/docker-compose.yml b/docker-compose.yml
index 7b01e2fb..1fd96e54 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -333,7 +333,7 @@ services:
     acme-mailcow:
       depends_on:
         - nginx-mailcow
-      image: mailcow/acme:1.68
+      image: mailcow/acme:1.69
       dns:
         - ${IPV4_NETWORK:-172.22.1}.254
       environment:
@@ -387,7 +387,7 @@ services:
         - /lib/modules:/lib/modules:ro
 
     watchdog-mailcow:
-      image: mailcow/watchdog:1.71
+      image: mailcow/watchdog:1.72
       # Debug
       #command: /watchdog.sh
       dns: