From b3c3ac669ee8e41120f16b324b71b737db5688bf Mon Sep 17 00:00:00 2001
From: Felix Bartels <1257835+fbartels@users.noreply.github.com>
Date: Wed, 18 Sep 2019 17:17:35 +0200
Subject: [PATCH] Switch to `PERMIT_DOCKER=connected-networks` (#210)

* test if https://github.com/tomav/docker-mailserver/issues/1079 is resolved
* add spooler test to commander target
---
 Makefile                              | 1 +
 core/commander/spooler/commander.yaml | 9 +++++++++
 docker-compose.yml                    | 4 ++--
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100755 core/commander/spooler/commander.yaml

diff --git a/Makefile b/Makefile
index 550a5e1..e981423 100644
--- a/Makefile
+++ b/Makefile
@@ -388,6 +388,7 @@ test-goss: ## Test configuration of containers with goss
 test-commander: ## Test scripts with commander
 	commander test tests/commander.yaml
 	COMMANDER_OPTS="--concurrent 1" COMMANDER_FILES_PATH=core/commander/server dccommander run kopano_server
+	COMMANDER_OPTS="--concurrent 1" COMMANDER_FILES_PATH=core/commander/spooler dccommander run kopano_spooler
 
 test-security: ## Scan containers with Trivy for known security risks (not part of CI workflow for now).
 	cat $(TAG_FILE) | xargs -I % sh -c 'trivy --exit-code 0 --severity HIGH --quiet --auto-refresh %'
diff --git a/core/commander/spooler/commander.yaml b/core/commander/spooler/commander.yaml
new file mode 100755
index 0000000..3358d9a
--- /dev/null
+++ b/core/commander/spooler/commander.yaml
@@ -0,0 +1,9 @@
+tests:
+  test sending mail:
+    command:  apt update && apt install -y swaks netbase && dockerize -wait tcp://"$KCCONF_SPOOLER_SMTP_SERVER":25 -timeout 1080s swaks --to user1@kopano.demo --server $KCCONF_SPOOLER_SMTP_SERVER
+    exit-code: 0
+
+config:
+  env:
+    PATH: ${PATH}
+    KCCONF_SPOOLER_SMTP_SERVER: ${KCCONF_SPOOLER_SMTP_SERVER}
diff --git a/docker-compose.yml b/docker-compose.yml
index 5331799..14b0d93 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -44,7 +44,7 @@ services:
       - ldap-net
 
   mail:
-    image: tvial/docker-mailserver:release-v6.1.0
+    image: tvial/docker-mailserver:release-v6.2.0
     restart: unless-stopped
     hostname: mail
     domainname: ${LDAP_DOMAIN}
@@ -82,7 +82,7 @@ services:
       - SASLAUTHD_MECHANISMS=ldap
       - POSTMASTER_ADDRESS=${POSTMASTER_ADDRESS}
       - SMTP_ONLY=1
-      - PERMIT_DOCKER=host
+      - PERMIT_DOCKER=connected-networks
       - ENABLE_POSTFIX_VIRTUAL_TRANSPORT=1
       - POSTFIX_DAGENT=lmtp:kopano_dagent:2003
       - REPORT_RECIPIENT=1