2571: Upgrade to alpine 3.17.0 r=mergify[bot] a=nextgens

## What type of PR?

enhancement

## What does this PR do?

Upgrade to alpine 3.17.0.

### Related issue(s)

## 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>
main
bors[bot] 2 years ago committed by GitHub
commit f169f81436
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1,7 +1,7 @@
# syntax=docker/dockerfile-upstream:1.4.3 # syntax=docker/dockerfile-upstream:1.4.3
# base system image (intermediate) # base system image (intermediate)
ARG DISTRO=alpine:3.16.3 ARG DISTRO=alpine:3.17.0
FROM $DISTRO as system FROM $DISTRO as system
ENV TZ=Etc/UTC LANG=C.UTF-8 ENV TZ=Etc/UTC LANG=C.UTF-8
@ -56,7 +56,7 @@ RUN set -euxo pipefail \
; machine="$(uname -m)" \ ; machine="$(uname -m)" \
; deps="build-base gcc libffi-dev python3-dev" \ ; deps="build-base gcc libffi-dev python3-dev" \
; [[ "${machine}" != x86_64 ]] && \ ; [[ "${machine}" != x86_64 ]] && \
deps="${deps} cargo git libressl-dev mariadb-connector-c-dev postgresql-dev" \ deps="${deps} cargo git libretls-dev mariadb-connector-c-dev postgresql-dev" \
; apk add --virtual .build-deps ${deps} \ ; apk add --virtual .build-deps ${deps} \
; [[ "${machine}" == armv7* ]] && \ ; [[ "${machine}" == armv7* ]] && \
mkdir -p /root/.cargo/registry/index && \ mkdir -p /root/.cargo/registry/index && \
@ -66,10 +66,6 @@ RUN set -euxo pipefail \
; cd snuffleupagus-$SNUFFLEUPAGUS_VERSION \ ; cd snuffleupagus-$SNUFFLEUPAGUS_VERSION \
; rm -rf src/tests/*php7*/ src/tests/*session*/ src/tests/broken_configuration/ src/tests/*cookie* src/tests/upload_validation/ \ ; rm -rf src/tests/*php7*/ src/tests/*session*/ src/tests/broken_configuration/ src/tests/*cookie* src/tests/upload_validation/ \
; apk add --virtual .build-deps php81-dev php81-cgi php81-simplexml php81-xml pcre-dev build-base php81-pear php81-openssl re2c \ ; apk add --virtual .build-deps php81-dev php81-cgi php81-simplexml php81-xml pcre-dev build-base php81-pear php81-openssl re2c \
; ln -s /usr/bin/phpize81 /usr/bin/phpize \
; ln -s /usr/bin/pecl81 /usr/bin/pecl \
; ln -s /usr/bin/php-config81 /usr/bin/php-config \
; ln -s /usr/bin/php81 /usr/bin/php \
; pecl install vld-beta \ ; pecl install vld-beta \
; make -j $(grep -c processor /proc/cpuinfo) release \ ; make -j $(grep -c processor /proc/cpuinfo) release \
; cp src/.libs/snuffleupagus.so /app \ ; cp src/.libs/snuffleupagus.so /app \

@ -0,0 +1 @@
Upgrade to Alpine 3.17.0

@ -18,7 +18,6 @@ RUN set -euxo pipefail \
aspell-uk aspell-ru aspell-fr aspell-de aspell-en \ aspell-uk aspell-ru aspell-fr aspell-de aspell-en \
; rm /etc/nginx/http.d/default.conf \ ; rm /etc/nginx/http.d/default.conf \
; rm /etc/php81/php-fpm.d/www.conf \ ; rm /etc/php81/php-fpm.d/www.conf \
; ln -s /usr/bin/php81 /usr/bin/php \
; gpg --import /tmp/snappymail.asc \ ; gpg --import /tmp/snappymail.asc \
; gpg --import /tmp/roundcube.asc \ ; gpg --import /tmp/roundcube.asc \
; echo extension=snuffleupagus > /etc/php81/conf.d/snuffleupagus.ini \ ; echo extension=snuffleupagus > /etc/php81/conf.d/snuffleupagus.ini \

Loading…
Cancel
Save