From d65054f3bdf4aa55d43daadb24d02b9fd8b72abb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sara=20Aim=C3=A9e=20Smiseth?=
 <51710585+SaraSmiseth@users.noreply.github.com>
Date: Sat, 8 Jun 2024 08:59:07 +0200
Subject: [PATCH] Update base image to mailserver2/debian-mail-overlay:1.0.15
 (#67)

* Update base image to mailserver2/debian-mail-overlay:1.0.15
* Fix environment variables replacement tests. The newest rspamd version has a template that caused a false positive. Now only check our files in /etc/rspamd/local.d instead of all in /etc/rspamd
---
 Dockerfile        | 2 +-
 test/default.bats | 2 +-
 test/ldap.bats    | 2 +-
 test/ldap2.bats   | 2 +-
 test/reverse.bats | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 18b6d51..e12fc72 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM mailserver2/debian-mail-overlay:1.0.14
+FROM mailserver2/debian-mail-overlay:1.0.15
 
 LABEL description="Simple and full-featured mail server using Docker"
 
diff --git a/test/default.bats b/test/default.bats
index 809acae..10d4c92 100644
--- a/test/default.bats
+++ b/test/default.bats
@@ -41,7 +41,7 @@ load 'test_helper/bats-assert/load'
 }
 
 @test "checking system: all environment variables have been replaced (default configuration)" {
-  run docker exec mailserver_default /bin/bash -c "egrep -R -I "{{.*}}" /etc/postfix /etc/postfixadmin/fetchmail.conf /etc/dovecot /etc/rspamd /etc/cron.d /etc/mailname /usr/local/bin"
+  run docker exec mailserver_default /bin/bash -c "egrep -R -I "{{.*}}" /etc/postfix /etc/postfixadmin/fetchmail.conf /etc/dovecot /etc/rspamd/local.d /etc/cron.d /etc/mailname /usr/local/bin"
   assert_failure
 }
 
diff --git a/test/ldap.bats b/test/ldap.bats
index a053682..262904b 100644
--- a/test/ldap.bats
+++ b/test/ldap.bats
@@ -12,7 +12,7 @@ load 'test_helper/bats-assert/load'
 }
 
 @test "checking system: all environment variables have been replaced (ldap configuration)" {
-  run docker exec mailserver_ldap /bin/bash -c "egrep -R -I "{{.*}}" /etc/postfix /etc/postfixadmin/fetchmail.conf /etc/dovecot /etc/rspamd /etc/cron.d /etc/mailname /usr/local/bin"
+  run docker exec mailserver_ldap /bin/bash -c "egrep -R -I "{{.*}}" /etc/postfix /etc/postfixadmin/fetchmail.conf /etc/dovecot /etc/rspamd/local.d /etc/cron.d /etc/mailname /usr/local/bin"
   assert_failure
 }
 
diff --git a/test/ldap2.bats b/test/ldap2.bats
index a9b289f..eb26d38 100644
--- a/test/ldap2.bats
+++ b/test/ldap2.bats
@@ -6,7 +6,7 @@ load 'test_helper/bats-assert/load'
 #
 
 @test "checking system: all environment variables have been replaced (ldap2 configuration)" {
-  run docker exec mailserver_ldap2 /bin/bash -c "egrep -R -I "{{.*}}" /etc/postfix /etc/postfixadmin/fetchmail.conf /etc/dovecot /etc/rspamd /etc/cron.d /etc/mailname /usr/local/bin"
+  run docker exec mailserver_ldap2 /bin/bash -c "egrep -R -I "{{.*}}" /etc/postfix /etc/postfixadmin/fetchmail.conf /etc/dovecot /etc/rspamd/local.d /etc/cron.d /etc/mailname /usr/local/bin"
   assert_failure
 }
 
diff --git a/test/reverse.bats b/test/reverse.bats
index 968ef12..e70b5b3 100644
--- a/test/reverse.bats
+++ b/test/reverse.bats
@@ -12,7 +12,7 @@ load 'test_helper/bats-assert/load'
 }
 
 @test "checking system: all environment variables have been replaced (reverse configuration)" {
-  run docker exec mailserver_reverse /bin/bash -c "egrep -R -I "{{.*}}" /etc/postfix /etc/postfixadmin/fetchmail.conf /etc/dovecot /etc/rspamd /etc/cron.d /etc/mailname /usr/local/bin"
+  run docker exec mailserver_reverse /bin/bash -c "egrep -R -I "{{.*}}" /etc/postfix /etc/postfixadmin/fetchmail.conf /etc/dovecot /etc/rspamd/local.d /etc/cron.d /etc/mailname /usr/local/bin"
   assert_failure
 }