From 0e4f1782083326181351d9439f2aad761b0acb1c Mon Sep 17 00:00:00 2001
From: Sebastian Hugentobler <sebastian@vanwa.ch>
Date: Wed, 23 Nov 2022 14:02:16 +0100
Subject: [PATCH] use php 8.1

---
 Dockerfile | 93 +++++++++++++++++++++++++++---------------------------
 1 file changed, 46 insertions(+), 47 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d095bd0..f078694 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,17 @@
-FROM docker.io/alpine:3.16 AS builder
+FROM docker.io/alpine:3.17 AS builder
 
 RUN apk add --no-cache \
-    php8 \
-    php8-phar \
-    php8-mbstring \
-    php8-openssl \
-    php8-ctype \
-    php8-gd \
-    php8-dom \
-    php8-xml \
-    php8-ldap \
-    php8-xmlreader \
-    php8-xmlwriter
+  php81 \
+  php81-phar \
+  php81-mbstring \
+  php81-openssl \
+  php81-ctype \
+  php81-gd \
+  php81-dom \
+  php81-xml \
+  php81-ldap \
+  php81-xmlreader \
+  php81-xmlwriter
 
 ENV COMPOSER_VERSION=2.1.6
 ENV COMPOSER_SHA256_SUM=72524ccebcb071968eb83284507225fdba59f223719b2b3f333d76c8a9ac6b72
@@ -27,43 +27,42 @@ RUN echo "$SHA256_SUM  roundcubemail-$VERSION-complete.tar.gz" | sha256sum -c -
 RUN mkdir -p /var/lib/roundcube
 RUN tar xzf roundcubemail-$VERSION-complete.tar.gz -C /var/lib/roundcube --strip 1
 
-FROM docker.io/thallian/php8-fpm:3.16
+FROM docker.io/thallian/php8-fpm:3.17
 
 RUN apk add --no-cache \
-    openssl \
-    tar \
-    nginx \
-    postgresql-client \
-    aspell \
-    ca-certificates \
-    php8 \
-    php8-imap \
-    php8-dom \
-    php8-json \
-    php8-xml \
-    php8-session \
-    php8-pdo \
-    php8-pdo_pgsql \
-    php8-sockets \
-    php8-exif \
-    php8-iconv \
-    php8-openssl \
-    php8-mbstring \
-    php8-sockets \
-    php8-pecl-mcrypt \
-    php8-zip \
-    php8-pspell \
-    php8-pecl-apcu \
-    php8-gd \
-    php8-ctype \
-    php8-xmlreader \
-    php8-xmlwriter \
-    php8-tokenizer \
-    php8-curl \
-    php8-simplexml \
-    php8-xml \
-    php8-dom \
-    php8-intl
+  openssl \
+  tar \
+  nginx \
+  postgresql-client \
+  aspell \
+  ca-certificates \
+  php81 \
+  php81-imap \
+  php81-dom \
+  php81-json \
+  php81-xml \
+  php81-session \
+  php81-pdo \
+  php81-pdo_pgsql \
+  php81-sockets \
+  php81-exif \
+  php81-iconv \
+  php81-openssl \
+  php81-mbstring \
+  php81-sockets \
+  php81-zip \
+  php81-pspell \
+  php81-pecl-apcu \
+  php81-gd \
+  php81-ctype \
+  php81-xmlreader \
+  php81-xmlwriter \
+  php81-tokenizer \
+  php81-curl \
+  php81-simplexml \
+  php81-xml \
+  php81-dom \
+  php81-intl
 
 COPY --from=builder --chown=nginx:nginx /var/lib/roundcube /var/lib/roundcube