revert to pigeonhole 0.4.18
This commit is contained in:
parent
cdcbd3731c
commit
c2d2df7bb2
18
Dockerfile
18
Dockerfile
@ -1,8 +1,20 @@
|
|||||||
FROM registry.gitlab.com/thallian/docker-confd-env:master
|
FROM registry.gitlab.com/thallian/docker-confd-env:master
|
||||||
|
|
||||||
RUN apk add --no-cache dovecot dovecot-ldap libressl ssmtp ca-certificates
|
ADD i_zero.patch /usr/include/dovecot/i_zero.patch
|
||||||
RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/main \
|
|
||||||
dovecot-pigeonhole-plugin-ldap
|
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 addgroup -g 1111 vmail
|
RUN addgroup -g 1111 vmail
|
||||||
RUN adduser -u 1111 -h /var/lib/vmail -D -G vmail vmail
|
RUN adduser -u 1111 -h /var/lib/vmail -D -G vmail vmail
|
||||||
|
12
i_zero.patch
Normal file
12
i_zero.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
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
|
Loading…
Reference in New Issue
Block a user