From 84af3a3e503fbc5b8390d3fdbeb266f60efb3d25 Mon Sep 17 00:00:00 2001 From: willofr Date: Mon, 6 Dec 2021 21:43:06 +0100 Subject: [PATCH 1/3] use dovecot-fts-xapian from alpine package I suggest using the dovecot-fts-xapian package from the alpine repository (newer) instead of compiling an older version from source: see https://pkgs.alpinelinux.org/package/edge/community/x86/dovecot-fts-xapian --- core/dovecot/Dockerfile | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/core/dovecot/Dockerfile b/core/dovecot/Dockerfile index 7a2dbdc1..8fcc391b 100644 --- a/core/dovecot/Dockerfile +++ b/core/dovecot/Dockerfile @@ -1,14 +1,4 @@ -ARG DISTRO=alpine:3.14.2 -FROM $DISTRO as builder -WORKDIR /tmp -RUN apk add git build-base automake autoconf libtool dovecot-dev xapian-core-dev icu-dev -RUN git clone https://github.com/grosjo/fts-xapian.git \ - && cd fts-xapian \ - && git checkout 1.2.7 \ - && autoreconf -vi \ - && PANDOC=false ./configure --with-dovecot=/usr/lib/dovecot \ - && make \ - && make install +ARG DISTRO=alpine:3.14 FROM $DISTRO @@ -27,11 +17,9 @@ RUN pip3 install "podop>0.2.5" # Image specific layers under this line RUN apk add --no-cache \ - dovecot dovecot-lmtpd dovecot-pop3d dovecot-submissiond dovecot-pigeonhole-plugin rspamd-client xapian-core \ + dovecot dovecot-lmtpd dovecot-pop3d dovecot-submissiond dovecot-pigeonhole-plugin rspamd-client xapian-core dovecot-fts-xapian \ && mkdir /var/lib/dovecot -COPY --from=builder /usr/lib/dovecot/lib21_fts_xapian_plugin.* /usr/lib/dovecot/ - COPY conf /conf COPY start.py /start.py From 841b29e794cdb8a5ee396cc9de794a6609767dc9 Mon Sep 17 00:00:00 2001 From: willofr Date: Tue, 7 Dec 2021 18:20:16 +0100 Subject: [PATCH 2/3] revert back to alpine 3.14.2 as requested --- core/dovecot/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/dovecot/Dockerfile b/core/dovecot/Dockerfile index 8fcc391b..c2d7b063 100644 --- a/core/dovecot/Dockerfile +++ b/core/dovecot/Dockerfile @@ -1,4 +1,4 @@ -ARG DISTRO=alpine:3.14 +ARG DISTRO=alpine:3.14.2 FROM $DISTRO From 206c6b3427e6701b91da5ebceef2f0870976f89b Mon Sep 17 00:00:00 2001 From: willofr Date: Tue, 7 Dec 2021 18:27:14 +0100 Subject: [PATCH 3/3] Create 2072.enhancement --- towncrier/newsfragments/2072.enhancement | 1 + 1 file changed, 1 insertion(+) create mode 100644 towncrier/newsfragments/2072.enhancement diff --git a/towncrier/newsfragments/2072.enhancement b/towncrier/newsfragments/2072.enhancement new file mode 100644 index 00000000..48275dff --- /dev/null +++ b/towncrier/newsfragments/2072.enhancement @@ -0,0 +1 @@ +use dovecot-fts-xapian from alpine package