Merge branch '1.5' into 1.5-alpine_3.8

.travis.yml

@@ -1,8 +1,2 @@
-language: python
-python:
-  - "3.6"
-install:
-  - pip install -r docs/requirements.txt
 script:
-  - sphinx-versioning build -b -B 1.5 -r 1.5 -w '^[0-9.]*$' -w master -W '^$' docs/ build/
-  - python docs/conf.py build $DEPLOY_HOST $DEPLOY_USERNAME $DEPLOY_PASSWORD $DEPLOY_REMOTEDIR
+  - /bin/true

core/admin/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3-alpine
+FROM python:3-alpine3.7
 
 RUN mkdir -p /app
 WORKDIR /app

core/dovecot/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:edge
+FROM alpine:3.7
 
 RUN echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
  && apk add --no-cache \

core/dovecot/sieve/report-ham.sieve

@@ -1,3 +1,11 @@
-require "vnd.dovecot.execute";
+require ["vnd.dovecot.execute", "copy", "imapsieve", "environment", "variables"];
+
+if environment :matches "imap.mailbox" "*" {
+  set "mailbox" "${1}";
+}
+
+if string "${mailbox}" "Trash" {
+  stop;
+}
 
 execute :pipe "mailtrain" "ham";

core/none/Dockerfile

@@ -1,5 +1,5 @@
 # This is an idle image to dynamically replace any component if disabled.
 
-FROM alpine
+FROM alpine:3.7
 
 CMD sleep 1000000d

core/postfix/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine
+FROM alpine:3.7
 
 RUN apk add --no-cache postfix postfix-sqlite postfix-pcre rsyslog python py-jinja2
 

docs/compose/setup.rst

@@ -90,7 +90,7 @@ setting. The configuration option must be one of the following:
 - ``none`` disables antivirus checks;
 - ``clamav`` is the default values, the popular ClamAV antivirus is enabled.
 
-Make sure that you have at least 1GB or memory for ClamAV to load its signature
+Make sure that you have at least 1GB of memory for ClamAV to load its signature
 database.
 
 Finish setting up TLS

docs/index.rst

@@ -25,7 +25,7 @@ Main features include:
 
 - **Standard email server**, IMAP and IMAP+, SMTP and Submission
 - **Advanced email features**, aliases, domain aliases, custom routing
-- **Web access**, multiple Webmails and adminitration interface
+- **Web access**, multiple Webmails and administration interface
 - **User features**, aliases, auto-reply, auto-forward, fetched accounts
 - **Admin features**, global admins, announcements, per-domain delegation, quotas
 - **Security**, enforced TLS, Letsencrypt!, outgoing DKIM, anti-virus scanner

optional/clamav/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:edge
+FROM alpine:3.7
 
 RUN apk add --no-cache clamav rsyslog wget clamav-libunrar
 

optional/radicale/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:edge
+FROM alpine:3.7
 
 RUN echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
  && apk add --no-cache radicale@testing py-dulwich@testing

services/fetchmail/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:alpine
+FROM python:alpine3.7
 
 RUN apk add --no-cache fetchmail ca-certificates
 

services/rspamd/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:edge
+FROM alpine:3.7
 
 RUN apk add --no-cache python py-jinja2 rspamd rspamd-controller rspamd-proxy ca-certificates
 

webmails/roundcube/Dockerfile

@@ -4,7 +4,7 @@ RUN apt-get update && apt-get install -y \
       libfreetype6-dev \
       libjpeg62-turbo-dev \
       libmcrypt-dev \
-      libpng12-dev \
+      libpng-dev \
  && docker-php-ext-install pdo_mysql mcrypt
 
 ENV ROUNDCUBE_URL https://github.com/roundcube/roundcubemail/releases/download/1.3.3/roundcubemail-1.3.3-complete.tar.gz