use pigenhole-ldap from alpine repo

This commit is contained in:
Sebastian Hugentobler 2018-06-07 11:51:19 +02:00
parent f4d35ab751
commit 1698f5b458
2 changed files with 8 additions and 27 deletions

View File

@ -1,20 +1,13 @@
FROM registry.gitlab.com/thallian/docker-confd-env:master 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 \
RUN apk add --no-cache dovecot dovecot-ldap libressl ssmtp ca-certificates g++ openldap-dev dovecot-dev make tar && \ dovecot-ldap \
cd /usr/include/dovecot && \ dovecot-pigeonhole-plugin \
patch -p1 < i_zero.patch && \ dovecot-pigeonhole-plugin-ldap \
rm /usr/include/dovecot/i_zero.patch && \ libressl \
mkdir /tmp/pigeonhole && \ ssmtp \
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 && \ ca-certificates
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 addgroup -g 2222 access RUN addgroup -g 2222 access
RUN addgroup dovecot access RUN addgroup dovecot access

View File

@ -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