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
mailserver2 · Jun 8, 2024 · d65054f · d65054f
1 parent fd944a7
commit d65054f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
 }