From 71ca4b288ae34f7d182194549e028ab657df9632 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 21 Oct 2025 21:53:34 +0000
Subject: [PATCH 1/2] chore(deps): update alpine docker tag to v3.22.2

---
 build-images.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/build-images.sh b/build-images.sh
index 7ef7f9a9..841bd38d 100644
--- a/build-images.sh
+++ b/build-images.sh
@@ -55,7 +55,7 @@ images+=("${repobase}/${reponame}")
 # davidep: avoid dovecot 2.3.19-r2 - userdb lookup crashes
 #
 reponame="mail-dovecot"
-container=$(buildah from docker.io/library/alpine:3.21.3)
+container=$(buildah from docker.io/library/alpine:3.22.2)
 buildah run "${container}" /bin/sh <<'EOF'
 set -e
 addgroup -g 101 -S vmail
@@ -125,7 +125,7 @@ images+=("${repobase}/${reponame}")
 # Postfix additional image
 #
 reponame="mail-postfix"
-container=$(buildah from docker.io/library/alpine:3.21.3)
+container=$(buildah from docker.io/library/alpine:3.22.2)
 buildah run "${container}" /bin/sh <<EOF
 set -e
 apk add --no-cache postfix gettext sqlite postfix-sqlite postfix-ldap openssl cyrus-sasl-login
@@ -149,7 +149,7 @@ images+=("${repobase}/${reponame}")
 # Rspamd additional image
 #
 reponame="mail-rspamd"
-container=$(buildah from docker.io/library/alpine:3.21.3)
+container=$(buildah from docker.io/library/alpine:3.22.2)
 buildah run "${container}" /bin/sh <<EOF
 set -e
 # Software installation order is important to preserve uid and gid allocation:
@@ -177,7 +177,7 @@ images+=("${repobase}/${reponame}")
 # ClamAV additional image
 #
 reponame="mail-clamav"
-container=$(buildah from docker.io/library/alpine:3.21.3)
+container=$(buildah from docker.io/library/alpine:3.22.2)
 buildah run "${container}" /bin/sh <<'EOF'
 set -e
 apk add --no-cache ncurses bash curl wget rsync bind-tools socat gpg gpg-agent

From 15013292a4325b0354e355704ae1e71ac1ac3e03 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 13 Nov 2025 21:28:58 +0000
Subject: [PATCH 2/2] Replace manual flatcurve build with Alpine package

Co-authored-by: DavidePrincipi <2920838+DavidePrincipi@users.noreply.github.com>
---
 build-images.sh | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/build-images.sh b/build-images.sh
index 841bd38d..d83b8f34 100644
--- a/build-images.sh
+++ b/build-images.sh
@@ -74,20 +74,8 @@ apk add --no-cache rspamd-client
     mv -v .post-install /usr/local/bin/dovecot-post-install
     rm -rvf "${tmpdir}"
 )
-(
-    apk add --no-cache build-base git autoconf automake libtool dovecot-dev xapian-core-dev  icu-dev
-    mkdir /tmp/build
-    cd /tmp/build
-    git clone https://github.com/slusarz/dovecot-fts-flatcurve.git
-    cd dovecot-fts-flatcurve/
-    ash autogen.sh
-    ./configure --disable-static --with-dovecot=/usr/lib/dovecot/
-    make
-    make install
-    # clean what we installed
-    rm -rf /tmp/build
-    apk del build-base git autoconf automake libtool xapian-core-dev dovecot-dev icu-dev
-)
+# Install pre-built dovecot-fts-flatcurve package from Alpine repository
+apk add --no-cache dovecot-fts-flatcurve
 mkdir -p /var/lib/dovecot/dict/uquota
 mkdir -p /var/lib/umail
 sed -i 's/^!/#!/' /etc/dovecot/conf.d/10-auth.conf