From 8b19d542181c66c2698f8a006e8912ab397035f1 Mon Sep 17 00:00:00 2001
From: Johan Smits <johansmitsnl@users.noreply.github.com>
Date: Mon, 7 Aug 2017 17:37:16 +0200
Subject: [PATCH] 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
---
 Dockerfile      | 16 +++++++++++++++-
 test/tests.bats |  7 +++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 0dd6dff1..7e5c312d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,10 +12,13 @@ RUN apt-get update -q --fix-missing && \
   apt-get -y install --no-install-recommends \
     amavisd-new \
     arj \
+    binutils \
     bzip2 \
     ca-certificates \
+    cabextract \
     clamav \
     clamav-daemon \
+    cpio \
     curl \
     dovecot-core \
     dovecot-imapd \
@@ -32,23 +35,34 @@ RUN apt-get update -q --fix-missing && \
     gzip \
     iptables \
     locales \
+    liblz4-tool \
     libmail-spf-perl \
     libnet-dns-perl \
     libsasl2-modules \
+    lrzip \
+    lzop \
     netcat-openbsd \
+    nomarch \
     opendkim \
     opendkim-tools \
     opendmarc \
-    p7zip \
+    pax \
+    p7zip-full \
     postfix-ldap \
     postfix-policyd-spf-python \
     pyzor \
+    rar \
     razor \
+    ripole \
+    rpm2cpio \
     rsyslog \
     sasl2-bin \
     spamassassin \
     postgrey \
+    unrar-free \
     unzip \
+    xz-utils \
+    zoo \
     && \
   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 && \
diff --git a/test/tests.bats b/test/tests.bats
index be4ff2be..1afc6402 100644
--- a/test/tests.bats
+++ b/test/tests.bats
@@ -791,6 +791,13 @@ load 'test_helper/bats-assert/load'
   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
 #