diff --git a/data/Dockerfiles/dovecot/Dockerfile b/data/Dockerfiles/dovecot/Dockerfile index 8b315b45a..dd13fae7c 100644 --- a/data/Dockerfiles/dovecot/Dockerfile +++ b/data/Dockerfiles/dovecot/Dockerfile @@ -3,9 +3,10 @@ LABEL maintainer "The Infrastructure Company GmbH GmbH <info@servercow.de>" # renovate: datasource=github-releases depName=tianon/gosu versioning=semver-coerced extractVersion=^(?<version>.*)$ ARG GOSU_VERSION=1.16 +ARG DOVECOT_VERSION=2.3.20 +ARG PIGEONHOLE_VERSION=0.5.20 +ENV LC_ALL C -ENV LANG C.UTF-8 -ENV LC_ALL C.UTF-8 # Add groups and users before installing Dovecot to not break compatibility RUN addgroup -g 5000 vmail \ @@ -98,19 +99,22 @@ RUN addgroup -g 5000 vmail \ supervisor \ tzdata \ wget \ - dovecot \ - dovecot-dev \ - dovecot-lmtpd \ - dovecot-lua \ - dovecot-ldap \ - dovecot-mysql \ - dovecot-sql \ - dovecot-submissiond \ - dovecot-pigeonhole-plugin \ - dovecot-pop3d \ - dovecot-fts-solr \ - && arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) \ - && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$arch" \ + git \ + bison \ + flex \ + build-essential \ + autoconf \ + automake \ + libtool \ + make \ + default-libmysqlclient-dev \ + libicu-dev \ + zlib1g-dev \ + pkg-config \ + libsqlite3-dev \ + liblua5.3-dev \ + && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ && chmod +x /usr/local/bin/gosu \ && gosu nobody true diff --git a/data/conf/dovecot/dovecot.conf b/data/conf/dovecot/dovecot.conf index f2c917eff..9284d2cf8 100644 --- a/data/conf/dovecot/dovecot.conf +++ b/data/conf/dovecot/dovecot.conf @@ -241,8 +241,8 @@ plugin { mail_crypt_global_public_key = </mail_crypt/ecpubkey.pem mail_crypt_save_version = 2 - # Enable compression while saving, lz4 Dovecot v2.2.11+ - zlib_save = lz4 + # Enable compression while saving, zstd Dovecot v2.3.17+ + zlib_save = zstd mail_log_events = delete undelete expunge copy mailbox_delete mailbox_rename mail_log_fields = uid box msgid size