[Dovecot] Revert to 2.2 to fix various errors

master
andre.peters 2018-01-14 10:44:06 +01:00
parent 63ea097503
commit 5d5d36fc60
3 changed files with 82 additions and 83 deletions

View File

@ -3,17 +3,16 @@ LABEL maintainer "Andre Peters <andre.peters@servercow.de>"
ARG DEBIAN_FRONTEND=noninteractive
ENV LC_ALL C
ENV DOVECOT_VERSION 2.3.0
ENV PIGEONHOLE_VERSION 0.5.0.1
ENV ACLOCAL_DIR=m4
ENV ACLOCAL="aclocal -Im4"
ENV DOVECOT_VERSION 2.2.33.2
ENV PIGEONHOLE_VERSION 0.4.21
RUN apt-get update && apt-get -y --no-install-recommends install \
automake \
autotools-dev \
build-essential \
ca-certificates \
cpanminus \
wget \
curl \
default-libmysqlclient-dev \
libjson-webtoken-perl \
libcgi-pm-perl \
@ -54,13 +53,7 @@ RUN apt-get update && apt-get -y --no-install-recommends install \
libproc-processtable-perl \
liburi-perl \
lzma-dev \
git \
make \
autoconf \
automake \
pkgconf \
libtool \
gettext \
procps \
supervisor \
cron \
@ -70,22 +63,21 @@ RUN apt-get update && apt-get -y --no-install-recommends install \
&& rm -rf /var/lib/apt/lists/*
RUN git clone https://github.com/dovecot/core.git dovecot \
&& cd dovecot \
&& ./autogen.sh \
&& PANDOC=false ./configure --enable-maintainer-mode --with-mysql --with-lzma --with-lz4 --with-ssl=openssl --with-notify=inotify --with-storages=mdbox,sdbox,maildir,mbox,imapc,pop3c --with-bzlib --with-zlib \
RUN curl https://www.dovecot.org/releases/2.2/dovecot-$DOVECOT_VERSION.tar.gz | tar xvz \
&& cd dovecot-$DOVECOT_VERSION \
&& ./configure --with-mysql --with-lzma --with-lz4 --with-ssl=openssl --with-notify=inotify --with-storages=mdbox,sdbox,maildir,mbox,imapc,pop3c --with-bzlib --with-zlib \
&& make -j3 \
&& make install \
&& make clean \
&& cd .. && rm -rf dovecot \
&& wget -O - https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-$PIGEONHOLE_VERSION.tar.gz | tar xvz \
&& cd dovecot-2.3-pigeonhole-$PIGEONHOLE_VERSION \
&& cd .. && rm -rf dovecot-$DOVECOT_VERSION \
&& curl https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-$PIGEONHOLE_VERSION.tar.gz | tar xvz \
&& cd dovecot-2.2-pigeonhole-$PIGEONHOLE_VERSION \
&& ./configure \
&& make -j3 \
&& make install \
&& make clean \
&& cd .. \
&& rm -rf dovecot-2.3-pigeonhole-$PIGEONHOLE_VERSION
&& rm -rf dovecot-2.2-pigeonhole-$PIGEONHOLE_VERSION
RUN cpanm Data::Uniqid Mail::IMAPClient String::Util
RUN echo '* * * * * root /usr/local/bin/imapsync_cron.pl' > /etc/cron.d/imapsync
@ -125,3 +117,4 @@ CMD exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
RUN rm -rf \
/tmp/* \
/var/tmp/*

View File

@ -14,16 +14,22 @@ login_log_format_elements = "user=<%u> method=%m rip=%r lip=%l mpid=%e %c %k"
mail_home = /var/vmail/%d/%n
mail_location = maildir:~/
mail_plugins = quota acl zlib listescape #mail_crypt
# Dovecot 2.2
#ssl_protocols = !SSLv3
ssl_protocols = !SSLv3
# Dovecot 2.3
ssl_min_protocol = TLSv1
#ssl_min_protocol = TLSv1
ssl_prefer_server_ciphers = yes
ssl_cipher_list = EDH+CAMELLIA:EDH+aRSA:EECDH+aRSA+AESGCM:EECDH+aRSA+SHA256:EECDH:+CAMELLIA128:+AES128:+SSLv3:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!DSS:!RC4:!SEED:!IDEA:!ECDSA:kEDH:CAMELLIA128-SHA:AES128-SHA
# Default in Dovecot 2.3
ssl_options = no_compression
# New in Dovecot 2.3
ssl_dh=</etc/ssl/mail/dhparams.pem
#ssl_dh=</etc/ssl/mail/dhparams.pem
# Dovecot 2.2
ssl_dh_parameters_length = 2048
log_timestamp = "%Y-%m-%d %H:%M:%S "
recipient_delimiter = +
auth_master_user_separator = *

View File

@ -146,7 +146,7 @@ services:
- sogo
dovecot-mailcow:
image: mailcow/dovecot:1.16
image: mailcow/dovecot:1.17
build: ./data/Dockerfiles/dovecot
cap_add:
- NET_BIND_SERVICE