From 8d47f5f3474ab0754212cda0803c76a641c52c3b Mon Sep 17 00:00:00 2001
From: "andre.peters" <andre.peters@servercow.de>
Date: Sat, 13 Jan 2018 22:09:17 +0100
Subject: [PATCH 1/2] [Helper] Remove interactive and pseudo-TTY switch

---
 helper-scripts/backup_and_restore.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/helper-scripts/backup_and_restore.sh b/helper-scripts/backup_and_restore.sh
index 83bf3c9f..126c30c1 100755
--- a/helper-scripts/backup_and_restore.sh
+++ b/helper-scripts/backup_and_restore.sh
@@ -61,7 +61,7 @@ function backup() {
         debian:stretch-slim /bin/tar -cvpzf /backup/backup_vmail.tar.gz /vmail
       ;;&
     redis|all)
-      docker exec -it $(docker ps -qf name=redis) redis-cli save
+      docker exec $(docker ps -qf name=redis) redis-cli save
       docker run --rm \
         -v ${BACKUP_LOCATION}/mailcow-${DATE}:/backup \
         -v $(docker volume ls -qf name=redis):/redis \
@@ -74,14 +74,14 @@ function backup() {
         debian:stretch-slim /bin/tar -cvpzf /backup/backup_rspamd.tar.gz /rspamd
       ;;&
     postfix|all)
-      docker run -it --rm \
+      docker run --rm \
         -v ${BACKUP_LOCATION}/mailcow-${DATE}:/backup \
         -v $(docker volume ls -qf name=postfix):/postfix \
         debian:stretch-slim /bin/tar -cvpzf /backup/backup_postfix.tar.gz /postfix
       ;;&
     mysql|all)
       SQLIMAGE=$(grep -iEo '(mysql|mariadb)\:.+' ${COMPOSE_FILE})
-      docker run -it --rm \
+      docker run --rm \
         --network $(docker network ls -qf name=mailcow) \
         -v $(docker volume ls -qf name=mysql):/var/lib/mysql/ \
         --entrypoint= \

From 42923698fd744ecb1626b8f0e3f4ba5f546ba1c0 Mon Sep 17 00:00:00 2001
From: "andre.peters" <andre.peters@servercow.de>
Date: Sat, 13 Jan 2018 22:49:50 +0100
Subject: [PATCH 2/2] [Dovcot] Fixes for v2.3

---
 data/Dockerfiles/dovecot/Dockerfile | 2 ++
 docker-compose.yml                  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/data/Dockerfiles/dovecot/Dockerfile b/data/Dockerfiles/dovecot/Dockerfile
index e59af905..493973c0 100644
--- a/data/Dockerfiles/dovecot/Dockerfile
+++ b/data/Dockerfiles/dovecot/Dockerfile
@@ -65,6 +65,8 @@ RUN apt-get update && apt-get -y --no-install-recommends install \
 
 RUN curl https://www.dovecot.org/releases/2.3/dovecot-$DOVECOT_VERSION.tar.gz | tar xvz  \
 	&& cd dovecot-ce-$DOVECOT_VERSION \
+  && curl -L -o src/lib-compression/ostream-zlib.c https://raw.githubusercontent.com/dovecot/core/master/src/lib-compression/ostream-zlib.c \
+  && curl -L -o src/doveadm/doveadm-zlib.c https://raw.githubusercontent.com/dovecot/core/43a6cdb3561dcfc5950542ce62509a7747a977ae/src/doveadm/doveadm-zlib.c \
 	&& ./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 \
diff --git a/docker-compose.yml b/docker-compose.yml
index 179f1e9b..09d606c6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -146,7 +146,7 @@ services:
             - sogo
 
     dovecot-mailcow:
-      image: mailcow/dovecot:1.14
+      image: mailcow/dovecot:1.15
       build: ./data/Dockerfiles/dovecot
       cap_add:
         - NET_BIND_SERVICE