3279: Alpine 3.20 r=mergify[bot] a=nextgens

## What type of PR?

enhancement

## What does this PR do?

Switch to alpine 3.20. We still need edge for hardened-malloc.

Ensure we use 'normalize-icu' when indexing keywords in mails.

### Related issue(s)
- #2977

## Prerequisites
Before we can consider review and merge, please make sure the following list is done and checked.
If an entry in not applicable, you can check it or remove it from the list.

- [ ] In case of feature or enhancement: documentation updated accordingly
- [x] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/workflow.html#changelog) entry file.


Co-authored-by: Florent Daigniere <nextgens@freenetproject.org>
This commit is contained in:
bors-mailu[bot]
2024-05-28 11:24:52 +00:00
committed by GitHub
5 changed files with 6 additions and 8 deletions

View File

@@ -3,7 +3,7 @@
# base system image (intermediate)
# Note when updating the alpine tag, first manually run the workflow .github/workflows/mirror.yml.
# Just run the workflow with the tag that must be synchronised.
ARG DISTRO=ghcr.io/mailu/alpine:3.19.1
ARG DISTRO=ghcr.io/mailu/alpine:3.20
FROM $DISTRO as system
ENV TZ=Etc/UTC LANG=C.UTF-8
@@ -66,8 +66,6 @@ RUN set -euxo pipefail \
; rm -rf src/tests/*php7*/ src/tests/*session*/ src/tests/broken_configuration/ src/tests/*cookie* src/tests/upload_validation/ \
; apk add --virtual .build-deps php83-dev php83-cgi php83-simplexml php83-xml pcre-dev build-base php83-pear php83-openssl re2c \
; pecl83 install vld-beta \
; ln -s /usr/bin/phpize83 /usr/bin/phpize \
; ln -s /usr/bin/php-config83 /usr/bin/php-config \
; make -j $(grep -c processor /proc/cpuinfo) release \
; cp src/.libs/snuffleupagus.so /app \
; rm -rf /root/.cargo /tmp/*.pem /root/.cache

View File

@@ -7,7 +7,6 @@ ARG VERSION
LABEL version=$VERSION
RUN set -euxo pipefail \
; echo -e 'http://dl-cdn.alpinelinux.org/alpine/edge/main\nhttp://dl-cdn.alpinelinux.org/alpine/edge/testing\nhttp://dl-cdn.alpinelinux.org/alpine/edge/community' >> /etc/apk/repositories \
; apk add --no-cache 'dovecot<2.4' dovecot-lmtpd dovecot-pigeonhole-plugin dovecot-pop3d dovecot-submissiond rspamd-client dovecot-fts-flatcurve \
; mkdir /var/lib/dovecot

View File

@@ -69,9 +69,9 @@ plugin {
fts_enforced = yes
fts_autoindex_exclude = \Trash
fts_autoindex_exclude1 = \Junk
fts_filters = normalizer-icu snowball stopwords
fts_filters_en = lowercase snowball english-possessive stopwords
fts_filters_fr = lowercase snowball contractions stopwords
fts_filters = normalizer-icu lowercase snowball stopwords
fts_filters_en = normalizer-icu lowercase snowball english-possessive stopwords
fts_filters_fr = normalizer-icu lowercase snowball contractions stopwords
fts_header_excludes = Received DKIM-* ARC-* X-* x-* Comments Delivered-To Return-Path Authentication-Results Message-ID References In-Reply-To Thread-* Accept-Language Content-* MIME-Version
{% if FULL_TEXT_SEARCH_ATTACHMENTS %}
fts_tika = http://{{ FTS_ATTACHMENTS_ADDRESS }}:9998/tika/

View File

@@ -0,0 +1,2 @@
Switch to alpine 3.20, remove a dependency on edge for dovecot
Ensure we user normalizer-icu in all languages

View File

@@ -20,7 +20,6 @@ RUN set -euxo pipefail \
aspell-uk aspell-ru aspell-fr aspell-de aspell-en \
; rm /etc/nginx/http.d/default.conf \
; rm /etc/php83/php-fpm.d/www.conf \
; ln -s /usr/bin/php83 /usr/bin/php \
; mkdir -m 700 /root/.gnupg/ \
; gpg --import /tmp/snappymail.asc \
; gpg --import /tmp/roundcube.asc \