From 9e53ed4daff7b84c30658b5743456b9dfc354857 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9?= <andre.peters@servercow.de>
Date: Sun, 6 May 2018 09:15:35 +0200
Subject: [PATCH] [Watchdog] Update to new image with smtp-cli 3.9

---
 data/Dockerfiles/watchdog/Dockerfile | 42 ++++++++++++++--------------
 docker-compose.yml                   |  2 +-
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/data/Dockerfiles/watchdog/Dockerfile b/data/Dockerfiles/watchdog/Dockerfile
index 4958856f..d326a83b 100644
--- a/data/Dockerfiles/watchdog/Dockerfile
+++ b/data/Dockerfiles/watchdog/Dockerfile
@@ -3,28 +3,28 @@ LABEL maintainer "André Peters <andre.peters@servercow.de>"
 
 # Installation
 RUN apk add --update \
-	&& apk add --no-cache nagios-plugins-smtp \
-	nagios-plugins-tcp \
-	nagios-plugins-http \
-	nagios-plugins-ping \
-	curl \
-	bash \
-	jq \
-	fcgi \
-	nagios-plugins-mysql \
-	nagios-plugins-dns \
-    nagios-plugins-disk \
-	bind-tools \
-	redis \
-	perl \
-	perl-io-socket-ssl \
-	perl-socket \
-	perl-socket6 \
-	perl-mime-lite \
-	perl-term-readkey \
+  && apk add --no-cache nagios-plugins-smtp \
+  nagios-plugins-tcp \
+  nagios-plugins-http \
+  nagios-plugins-ping \
+  curl \
+  bash \
+  jq \
+  fcgi \
+  nagios-plugins-mysql \
+  nagios-plugins-dns \
+  nagios-plugins-disk \
+  bind-tools \
+  redis \
+  perl \
+  perl-io-socket-ssl \
+  perl-socket \
+  perl-socket6 \
+  perl-mime-lite \
+  perl-term-readkey \
   tini \
-	&& curl https://raw.githubusercontent.com/mludvig/smtp-cli/v3.9/smtp-cli -o /smtp-cli \
-	&& chmod +x smtp-cli
+  && curl https://raw.githubusercontent.com/mludvig/smtp-cli/v3.9/smtp-cli -o /smtp-cli \
+  && chmod +x smtp-cli
 
 COPY watchdog.sh /watchdog.sh
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 19d5b853..253015b2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -342,7 +342,7 @@ services:
         - /lib/modules:/lib/modules:ro
 
     watchdog-mailcow:
-      image: mailcow/watchdog:1.15
+      image: mailcow/watchdog:1.16
       # Debug
       #command: /watchdog.sh
       build: ./data/Dockerfiles/watchdog