From 5ee52e8e303c45edfbb629f25c78b2a6437ff957 Mon Sep 17 00:00:00 2001
From: luming <lm@rainss.cn>
Date: Thu, 11 Jan 2024 18:01:22 +0800
Subject: [PATCH] upgrade the php version.

---
 typecho/Dockerfile              | 10 ++++++----
 typecho/caddy/buildx/Dockerfile | 33 ++++++++++++++++++++++++---------
 2 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/typecho/Dockerfile b/typecho/Dockerfile
index 0277aa4..3a0e2cd 100644
--- a/typecho/Dockerfile
+++ b/typecho/Dockerfile
@@ -1,6 +1,6 @@
 FROM composer:latest as composer-build
 
-FROM php:8.1.15-fpm-alpine3.17
+FROM php:8.3-fpm-alpine3.19
 MAINTAINER rainerosion "admin@rainss.cn"
 
 COPY --from=composer-build /usr/bin/composer /usr/bin/composer
@@ -17,7 +17,8 @@ ENV BUILD_DEPS \
     oniguruma-dev \
     libmemcached-dev \
     zlib-dev \
-    imagemagick-dev
+    imagemagick-dev \
+    freetype-dev
 # runtime dependencies
 ENV RUN_DEPS \
     autoconf \
@@ -35,7 +36,8 @@ ENV RUN_DEPS \
     libmemcached \
     shadow \
     zlib \
-    imagemagick
+    imagemagick \
+    freetype
 # php extensions
 ENV PHP_EXTENSIONS \
     zip \
@@ -64,7 +66,7 @@ RUN set -eux && \
     usermod -u $UID -o $USER && \
     groupmod -g $GUID -o $USER && \
     apk add --no-cache --virtual .build-deps $BUILD_DEPS && \
-    docker-php-ext-configure gd --enable-gd --with-jpeg --with-webp && \
+    docker-php-ext-configure gd --enable-gd --with-jpeg --with-webp --with-freetype && \
     docker-php-ext-install -j $(nproc) $PHP_EXTENSIONS && \
     pecl install redis memcached imagick && \
     docker-php-ext-enable redis memcached imagick && \
diff --git a/typecho/caddy/buildx/Dockerfile b/typecho/caddy/buildx/Dockerfile
index 4827f3d..ca0c2f5 100644
--- a/typecho/caddy/buildx/Dockerfile
+++ b/typecho/caddy/buildx/Dockerfile
@@ -1,9 +1,10 @@
 FROM --platform=$TARGETPLATFORM composer:latest as composer-build
 
-FROM --platform=$TARGETPLATFORM php:8.1.15-fpm-alpine3.17
+FROM --platform=$TARGETPLATFORM php:8.3-fpm-alpine3.19
 MAINTAINER rainerosion "admin@rainss.cn"
 
 COPY --from=composer-build /usr/bin/composer /usr/bin/composer
+# build dependencies
 ENV BUILD_DEPS \
     libzip-dev \
     icu-dev \
@@ -14,8 +15,11 @@ ENV BUILD_DEPS \
     curl-dev \
     sqlite-dev \
     oniguruma-dev \
-    libmemcached-dev
-
+    libmemcached-dev \
+    zlib-dev \
+    imagemagick-dev \
+    freetype-dev
+# runtime dependencies
 ENV RUN_DEPS \
     autoconf \
     g++ \
@@ -29,8 +33,12 @@ ENV RUN_DEPS \
     curl \
     sqlite-libs \
     oniguruma \
-    libmemcached
-
+    libmemcached \
+    shadow \
+    zlib \
+    imagemagick \
+    freetype
+# php extensions
 ENV PHP_EXTENSIONS \
     zip \
     intl \
@@ -44,15 +52,22 @@ ENV PHP_EXTENSIONS \
     session \
     pdo_sqlite \
     fileinfo \
-    mbstring
-
+    mbstring \
+    bcmath
+# set default uid and gid for www-data
+ARG UID=1000
+ARG GUID=1000
+# fpm user
+ARG USER=www-data
 RUN set -eux && \
     sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories && \
     apk update && \
     apk add --no-cache $RUN_DEPS && \
+    usermod -u $UID -o $USER && \
+    groupmod -g $GUID -o $USER && \
     apk add --no-cache --virtual .build-deps $BUILD_DEPS && \
     docker-php-ext-configure gd --enable-gd --with-jpeg --with-webp && \
     docker-php-ext-install -j $(nproc) $PHP_EXTENSIONS && \
-    pecl install redis memcached  && \
-    docker-php-ext-enable redis memcached && \
+    pecl install redis memcached imagick && \
+    docker-php-ext-enable redis memcached imagick && \
     apk del .build-deps
\ No newline at end of file