Expand the decoders for amavis (Resolves: #659) (#677)

Use the guidelines from Ubuntu and added some more.
Added a test to ensure the number of decoders are present.
Guideline: https://help.ubuntu.com/community/PostfixAmavisNew
This commit is contained in:
Johan Smits 2017-08-07 17:37:16 +02:00 committed by Thomas VIAL
parent c9e5a92db3
commit 8b19d54218
2 changed files with 22 additions and 1 deletions

View file

@ -12,10 +12,13 @@ RUN apt-get update -q --fix-missing && \
apt-get -y install --no-install-recommends \ apt-get -y install --no-install-recommends \
amavisd-new \ amavisd-new \
arj \ arj \
binutils \
bzip2 \ bzip2 \
ca-certificates \ ca-certificates \
cabextract \
clamav \ clamav \
clamav-daemon \ clamav-daemon \
cpio \
curl \ curl \
dovecot-core \ dovecot-core \
dovecot-imapd \ dovecot-imapd \
@ -32,23 +35,34 @@ RUN apt-get update -q --fix-missing && \
gzip \ gzip \
iptables \ iptables \
locales \ locales \
liblz4-tool \
libmail-spf-perl \ libmail-spf-perl \
libnet-dns-perl \ libnet-dns-perl \
libsasl2-modules \ libsasl2-modules \
lrzip \
lzop \
netcat-openbsd \ netcat-openbsd \
nomarch \
opendkim \ opendkim \
opendkim-tools \ opendkim-tools \
opendmarc \ opendmarc \
p7zip \ pax \
p7zip-full \
postfix-ldap \ postfix-ldap \
postfix-policyd-spf-python \ postfix-policyd-spf-python \
pyzor \ pyzor \
rar \
razor \ razor \
ripole \
rpm2cpio \
rsyslog \ rsyslog \
sasl2-bin \ sasl2-bin \
spamassassin \ spamassassin \
postgrey \ postgrey \
unrar-free \
unzip \ unzip \
xz-utils \
zoo \
&& \ && \
curl https://packages.elasticsearch.org/GPG-KEY-elasticsearch | apt-key add - && \ curl https://packages.elasticsearch.org/GPG-KEY-elasticsearch | apt-key add - && \
echo "deb http://packages.elastic.co/beats/apt stable main" | tee -a /etc/apt/sources.list.d/beats.list && \ echo "deb http://packages.elastic.co/beats/apt stable main" | tee -a /etc/apt/sources.list.d/beats.list && \

View file

@ -791,6 +791,13 @@ load 'test_helper/bats-assert/load'
assert_failure assert_failure
} }
@test "checking system: amavis decoders installed and available" {
run docker exec mail /bin/sh -c "grep -E '.*(Internal decoder|Found decoder) for\s+\.(mail|Z|gz|bz2|xz|lzma|lrz|lzo|lz4|rpm|cpio|tar|deb|rar|arj|arc|zoo|doc|cab|tnef|zip|kmz|7z|jar|swf|lha|iso|exe).*' /var/log/mail/mail.log|wc -l"
assert_success
assert_output 28
}
# #
# sieve # sieve
# #