[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,18 +3,17 @@ LABEL maintainer "Andre Peters <andre.peters@servercow.de>"
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
ENV LC_ALL C ENV LC_ALL C
ENV DOVECOT_VERSION 2.3.0 ENV DOVECOT_VERSION 2.2.33.2
ENV PIGEONHOLE_VERSION 0.5.0.1 ENV PIGEONHOLE_VERSION 0.4.21
ENV ACLOCAL_DIR=m4
ENV ACLOCAL="aclocal -Im4"
RUN apt-get update && apt-get -y --no-install-recommends install \ RUN apt-get update && apt-get -y --no-install-recommends install \
automake \ automake \
autotools-dev \ autotools-dev \
build-essential \ build-essential \
ca-certificates \ ca-certificates \
cpanminus \ cpanminus \
wget \ curl \
default-libmysqlclient-dev \ default-libmysqlclient-dev \
libjson-webtoken-perl \ libjson-webtoken-perl \
libcgi-pm-perl \ libcgi-pm-perl \
libcrypt-openssl-rsa-perl \ libcrypt-openssl-rsa-perl \
@ -25,67 +24,60 @@ RUN apt-get update && apt-get -y --no-install-recommends install \
libsys-meminfo-perl \ libsys-meminfo-perl \
libtest-mockobject-perl \ libtest-mockobject-perl \
libwww-perl \ libwww-perl \
libauthen-ntlm-perl \ libauthen-ntlm-perl \
libbz2-dev \ libbz2-dev \
libcrypt-ssleay-perl \ libcrypt-ssleay-perl \
libdbd-mysql-perl \ libdbd-mysql-perl \
libdbi-perl \ libdbi-perl \
libdigest-hmac-perl \ libdigest-hmac-perl \
libfile-copy-recursive-perl \ libfile-copy-recursive-perl \
libio-compress-perl \ libio-compress-perl \
libio-socket-inet6-perl \ libio-socket-inet6-perl \
libio-socket-ssl-perl \ libio-socket-ssl-perl \
libio-tee-perl \ libio-tee-perl \
libipc-run-perl \ libipc-run-perl \
liblockfile-simple-perl \ liblockfile-simple-perl \
liblz-dev \ liblz-dev \
liblz4-dev \ liblz4-dev \
liblzma-dev \ liblzma-dev \
libmodule-scandeps-perl \ libmodule-scandeps-perl \
libnet-ssleay-perl \ libnet-ssleay-perl \
libpam-dev \ libpam-dev \
libpar-packer-perl \ libpar-packer-perl \
libreadonly-perl \ libreadonly-perl \
libssl-dev \ libssl-dev \
libterm-readkey-perl \ libterm-readkey-perl \
libtest-pod-perl \ libtest-pod-perl \
libtest-simple-perl \ libtest-simple-perl \
libunicode-string-perl \ libunicode-string-perl \
libproc-processtable-perl \ libproc-processtable-perl \
liburi-perl \ liburi-perl \
lzma-dev \ lzma-dev \
git \ make \
make \
autoconf \
automake \
pkgconf \
libtool \
gettext \
procps \ procps \
supervisor \ supervisor \
cron \ cron \
syslog-ng \ syslog-ng \
syslog-ng-core \ syslog-ng-core \
syslog-ng-mod-redis \ syslog-ng-mod-redis \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN git clone https://github.com/dovecot/core.git dovecot \ RUN curl https://www.dovecot.org/releases/2.2/dovecot-$DOVECOT_VERSION.tar.gz | tar xvz \
&& cd dovecot \ && cd dovecot-$DOVECOT_VERSION \
&& ./autogen.sh \ && ./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 \
&& 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 \ && make -j3 \
&& make -j3 \ && make install \
&& make install \ && make clean \
&& make clean \ && cd .. && rm -rf dovecot-$DOVECOT_VERSION \
&& cd .. && rm -rf dovecot \ && curl https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-$PIGEONHOLE_VERSION.tar.gz | tar xvz \
&& wget -O - https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-$PIGEONHOLE_VERSION.tar.gz | tar xvz \ && cd dovecot-2.2-pigeonhole-$PIGEONHOLE_VERSION \
&& cd dovecot-2.3-pigeonhole-$PIGEONHOLE_VERSION \ && ./configure \
&& ./configure \ && make -j3 \
&& make -j3 \ && make install \
&& make install \ && make clean \
&& make clean \ && cd .. \
&& cd .. \ && rm -rf dovecot-2.2-pigeonhole-$PIGEONHOLE_VERSION
&& rm -rf dovecot-2.3-pigeonhole-$PIGEONHOLE_VERSION
RUN cpanm Data::Uniqid Mail::IMAPClient String::Util RUN cpanm Data::Uniqid Mail::IMAPClient String::Util
RUN echo '* * * * * root /usr/local/bin/imapsync_cron.pl' > /etc/cron.d/imapsync RUN echo '* * * * * root /usr/local/bin/imapsync_cron.pl' > /etc/cron.d/imapsync
@ -103,25 +95,26 @@ COPY docker-entrypoint.sh /
COPY supervisord.conf /etc/supervisor/supervisord.conf COPY supervisord.conf /etc/supervisor/supervisord.conf
RUN chmod +x /usr/local/lib/dovecot/sieve/rspamd-pipe-ham \ RUN chmod +x /usr/local/lib/dovecot/sieve/rspamd-pipe-ham \
/usr/local/lib/dovecot/sieve/rspamd-pipe-spam \ /usr/local/lib/dovecot/sieve/rspamd-pipe-spam \
/usr/local/bin/imapsync_cron.pl \ /usr/local/bin/imapsync_cron.pl \
/usr/local/bin/postlogin.sh \ /usr/local/bin/postlogin.sh \
/usr/local/bin/imapsync /usr/local/bin/imapsync
RUN groupadd -g 5000 vmail \ RUN groupadd -g 5000 vmail \
&& groupadd -g 401 dovecot \ && groupadd -g 401 dovecot \
&& groupadd -g 402 dovenull \ && groupadd -g 402 dovenull \
&& useradd -g vmail -u 5000 vmail -d /var/vmail \ && useradd -g vmail -u 5000 vmail -d /var/vmail \
&& useradd -c "Dovecot unprivileged user" -d /dev/null -u 401 -g dovecot -s /bin/false dovecot \ && useradd -c "Dovecot unprivileged user" -d /dev/null -u 401 -g dovecot -s /bin/false dovecot \
&& useradd -c "Dovecot login user" -d /dev/null -u 402 -g dovenull -s /bin/false dovenull && useradd -c "Dovecot login user" -d /dev/null -u 402 -g dovenull -s /bin/false dovenull
RUN touch /etc/default/locale RUN touch /etc/default/locale
RUN apt-get purge -y build-essential automake autotools-dev \ RUN apt-get purge -y build-essential automake autotools-dev \
&& apt-get autoremove --purge -y && apt-get autoremove --purge -y
ENTRYPOINT ["/docker-entrypoint.sh"] ENTRYPOINT ["/docker-entrypoint.sh"]
CMD exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf CMD exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
RUN rm -rf \ RUN rm -rf \
/tmp/* \ /tmp/* \
/var/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_home = /var/vmail/%d/%n
mail_location = maildir:~/ mail_location = maildir:~/
mail_plugins = quota acl zlib listescape #mail_crypt mail_plugins = quota acl zlib listescape #mail_crypt
# Dovecot 2.2 # Dovecot 2.2
#ssl_protocols = !SSLv3 ssl_protocols = !SSLv3
# Dovecot 2.3 # Dovecot 2.3
ssl_min_protocol = TLSv1 #ssl_min_protocol = TLSv1
ssl_prefer_server_ciphers = yes 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 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 # Default in Dovecot 2.3
ssl_options = no_compression ssl_options = no_compression
# New in Dovecot 2.3 # 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 " log_timestamp = "%Y-%m-%d %H:%M:%S "
recipient_delimiter = + recipient_delimiter = +
auth_master_user_separator = * auth_master_user_separator = *

View File

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