Skip to content

Commit d65054f

Browse files
authored
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
1 parent fd944a7 commit d65054f

5 files changed

Lines changed: 5 additions & 5 deletions

File tree

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mailserver2/debian-mail-overlay:1.0.14
1+
FROM mailserver2/debian-mail-overlay:1.0.15
22

33
LABEL description="Simple and full-featured mail server using Docker"
44

test/default.bats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ load 'test_helper/bats-assert/load'
4141
}
4242

4343
@test "checking system: all environment variables have been replaced (default configuration)" {
44-
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"
44+
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"
4545
assert_failure
4646
}
4747

test/ldap.bats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ load 'test_helper/bats-assert/load'
1212
}
1313

1414
@test "checking system: all environment variables have been replaced (ldap configuration)" {
15-
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"
15+
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"
1616
assert_failure
1717
}
1818

test/ldap2.bats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ load 'test_helper/bats-assert/load'
66
#
77

88
@test "checking system: all environment variables have been replaced (ldap2 configuration)" {
9-
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"
9+
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"
1010
assert_failure
1111
}
1212

test/reverse.bats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ load 'test_helper/bats-assert/load'
1212
}
1313

1414
@test "checking system: all environment variables have been replaced (reverse configuration)" {
15-
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"
15+
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"
1616
assert_failure
1717
}
1818

0 commit comments

Comments
 (0)