From 619a5fbda20625dc3c99d238e7bfc9ca0130fc90 Mon Sep 17 00:00:00 2001 From: Florent Daigniere Date: Fri, 2 Dec 2022 16:44:44 +0100 Subject: [PATCH 1/5] Upgrade to alpine 3.17.0 --- core/base/Dockerfile | 2 +- towncrier/newsfragments/2570.misc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 towncrier/newsfragments/2570.misc diff --git a/core/base/Dockerfile b/core/base/Dockerfile index 65e8be94..e5ee50da 100644 --- a/core/base/Dockerfile +++ b/core/base/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile-upstream:1.4.3 # base system image (intermediate) -ARG DISTRO=alpine:3.16.3 +ARG DISTRO=alpine:3.17.0 FROM $DISTRO as system ENV TZ=Etc/UTC LANG=C.UTF-8 diff --git a/towncrier/newsfragments/2570.misc b/towncrier/newsfragments/2570.misc new file mode 100644 index 00000000..ec31181e --- /dev/null +++ b/towncrier/newsfragments/2570.misc @@ -0,0 +1 @@ +Upgrade to Alpine 3.17.0 From 73107ba1124b8f3904b7406b6defbb113127907d Mon Sep 17 00:00:00 2001 From: Florent Daigniere Date: Fri, 2 Dec 2022 17:19:11 +0100 Subject: [PATCH 2/5] libressl-dev is broken in the new release --- core/base/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/base/Dockerfile b/core/base/Dockerfile index e5ee50da..1b281384 100644 --- a/core/base/Dockerfile +++ b/core/base/Dockerfile @@ -56,7 +56,7 @@ RUN set -euxo pipefail \ ; machine="$(uname -m)" \ ; deps="build-base gcc libffi-dev python3-dev" \ ; [[ "${machine}" != x86_64 ]] && \ - deps="${deps} cargo git libressl-dev mariadb-connector-c-dev postgresql-dev" \ + deps="${deps} cargo git openssl-dev mariadb-connector-c-dev postgresql-dev" \ ; apk add --virtual .build-deps ${deps} \ ; [[ "${machine}" == armv7* ]] && \ mkdir -p /root/.cargo/registry/index && \ From 622e09312262839d683302ceda878c59d274458a Mon Sep 17 00:00:00 2001 From: Florent Daigniere Date: Fri, 2 Dec 2022 17:23:58 +0100 Subject: [PATCH 3/5] not required anymore --- core/base/Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/core/base/Dockerfile b/core/base/Dockerfile index 1b281384..f46a38a2 100644 --- a/core/base/Dockerfile +++ b/core/base/Dockerfile @@ -66,10 +66,6 @@ RUN set -euxo pipefail \ ; cd snuffleupagus-$SNUFFLEUPAGUS_VERSION \ ; 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 \ - ; 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 \ ; make -j $(grep -c processor /proc/cpuinfo) release \ ; cp src/.libs/snuffleupagus.so /app \ From 8150ca77b28f03f7a813faea550ebaf7fa5157ea Mon Sep 17 00:00:00 2001 From: Florent Daigniere Date: Fri, 2 Dec 2022 17:29:44 +0100 Subject: [PATCH 4/5] this isn't required anymore either --- webmails/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/webmails/Dockerfile b/webmails/Dockerfile index 19b739c9..2421e9ba 100644 --- a/webmails/Dockerfile +++ b/webmails/Dockerfile @@ -18,7 +18,6 @@ RUN set -euxo pipefail \ aspell-uk aspell-ru aspell-fr aspell-de aspell-en \ ; rm /etc/nginx/http.d/default.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/roundcube.asc \ ; echo extension=snuffleupagus > /etc/php81/conf.d/snuffleupagus.ini \ From ae6af92b1de85f56b0ecb2dfb253f1bf520858a6 Mon Sep 17 00:00:00 2001 From: Florent Daigniere Date: Thu, 8 Dec 2022 16:38:06 +0100 Subject: [PATCH 5/5] it's called libretls! --- core/base/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/base/Dockerfile b/core/base/Dockerfile index f46a38a2..dbb353f7 100644 --- a/core/base/Dockerfile +++ b/core/base/Dockerfile @@ -56,7 +56,7 @@ RUN set -euxo pipefail \ ; machine="$(uname -m)" \ ; deps="build-base gcc libffi-dev python3-dev" \ ; [[ "${machine}" != x86_64 ]] && \ - deps="${deps} cargo git openssl-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} \ ; [[ "${machine}" == armv7* ]] && \ mkdir -p /root/.cargo/registry/index && \