From 1698f5b45886d32db24bb7951b0f68db089fe623 Mon Sep 17 00:00:00 2001
From: Sebastian Hugentobler <sebastian.hugentobler@idparc.ch>
Date: Thu, 7 Jun 2018 11:51:19 +0200
Subject: [PATCH] use pigenhole-ldap from alpine repo

---
 Dockerfile   | 23 ++++++++---------------
 i_zero.patch | 12 ------------
 2 files changed, 8 insertions(+), 27 deletions(-)
 delete mode 100644 i_zero.patch

diff --git a/Dockerfile b/Dockerfile
index 4f11c89..2d873bf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,20 +1,13 @@
 FROM registry.gitlab.com/thallian/docker-confd-env:master
 
-ADD i_zero.patch /usr/include/dovecot/i_zero.patch
-
-RUN apk add --no-cache dovecot dovecot-ldap libressl ssmtp ca-certificates g++ openldap-dev dovecot-dev make tar && \
-    cd /usr/include/dovecot && \
-    patch -p1 < i_zero.patch && \
-    rm /usr/include/dovecot/i_zero.patch && \
-    mkdir /tmp/pigeonhole && \
-    wget -qO- https://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-0.4.18.tar.gz | tar -xz -C /tmp/pigeonhole --strip 1 && \
-    cd /tmp/pigeonhole && \
-    ./configure --with-ldap=yes --with-dovecot=/usr/lib/dovecot  && \
-    make && make install && \
-    rm -r /tmp/pigeonhole && \
-    apk del g++ openldap-dev dovecot-dev make tar
-
-WORKDIR /
+RUN apk add --no-cache \
+    dovecot \
+    dovecot-ldap \
+    dovecot-pigeonhole-plugin \
+    dovecot-pigeonhole-plugin-ldap \
+    libressl \
+    ssmtp \
+    ca-certificates
 
 RUN addgroup -g 2222 access
 RUN addgroup dovecot access
diff --git a/i_zero.patch b/i_zero.patch
deleted file mode 100644
index ecef32e..0000000
--- a/i_zero.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/macros.h b/macros.h
-index 566c176..ebbf480 100644
---- a/macros.h
-+++ b/macros.h
-@@ -240,4 +240,7 @@
- #  define STATIC_ARRAY
- #endif
-
-+#define i_zero(p) memset(p, 0, sizeof(*(p)))
-+#define i_zero_safe(p) safe_memset(p, 0, sizeof(*(p)))
-+
- #endif