From fdedb6fdce46ee6cd9cc23c0e3f570bcb12eb2cf Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Fri, 29 Mar 2019 07:48:12 +0100
Subject: [PATCH] [Compose] New ACME, watchdog and SOGo images [Compose] Add
 SKIP_HTTP_VERIFICATION defaulting to n [Compose] Add named volume
 sogo-web-vol-1 for static web content

---
 docker-compose.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 62a42c52..af9a2706 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -139,7 +139,7 @@ services:
             - phpfpm
 
     sogo-mailcow:
-      image: mailcow/sogo:1.53
+      image: mailcow/sogo:1.54
       build: ./data/Dockerfiles/sogo
       environment:
         - DBNAME=${DBNAME}
@@ -154,6 +154,7 @@ services:
         - ./data/web/inc/init_db.inc.php:/init_db.inc.php
         - ./data/conf/sogo/custom-sogo.js:/usr/lib/GNUstep/SOGo/WebServerResources/js/custom-sogo.js
         - mysql-socket-vol-1:/var/run/mysqld/
+        - sogo-web-vol-1:/sogo_web
       restart: always
       dns:
         - ${IPV4_NETWORK:-172.22.1}.254
@@ -281,8 +282,7 @@ services:
         - ./data/assets/ssl/:/etc/ssl/mail/:ro
         - ./data/conf/nginx/:/etc/nginx/conf.d/:rw
         - ./data/conf/rspamd/meta_exporter:/meta_exporter:ro
-      volumes_from:
-        - sogo-mailcow
+        - sogo-web-vol-1:/usr/lib/GNUstep/SOGo/
       ports:
         - "${HTTPS_BIND:-0.0.0.0}:${HTTPS_PORT:-443}:${HTTPS_PORT:-443}"
         - "${HTTP_BIND:-0.0.0.0}:${HTTP_PORT:-80}:${HTTP_PORT:-80}"
@@ -297,7 +297,7 @@ services:
     acme-mailcow:
       depends_on:
         - nginx-mailcow
-      image: mailcow/acme:1.50
+      image: mailcow/acme:1.51
       build: ./data/Dockerfiles/acme
       dns:
         - ${IPV4_NETWORK:-172.22.1}.254
@@ -310,6 +310,7 @@ services:
         - DBPASS=${DBPASS}
         - SKIP_LETS_ENCRYPT=${SKIP_LETS_ENCRYPT:-n}
         - SKIP_IP_CHECK=${SKIP_IP_CHECK:-n}
+        - SKIP_HTTP_VERIFICATION=${SKIP_HTTP_VERIFICATION:-n}
         - LE_STAGING=${LE_STAGING:-n}
         - TZ=${TZ}
       volumes:
@@ -348,7 +349,7 @@ services:
         - /lib/modules:/lib/modules:ro
 
     watchdog-mailcow:
-      image: mailcow/watchdog:1.38
+      image: mailcow/watchdog:1.39
       # Debug
       #command: /watchdog.sh
       build: ./data/Dockerfiles/watchdog
@@ -460,3 +461,4 @@ volumes:
   solr-vol-1:
   postfix-vol-1:
   crypt-vol-1:
+  sogo-web-vol-1: