From 833dcbd3cfbb55c76a6568b2466a0aa1445a30c4 Mon Sep 17 00:00:00 2001 From: pooneyy <85266337+pooneyy@users.noreply.github.com> Date: Thu, 2 Oct 2025 22:30:29 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(php-unofficial):=20update=20ph?= =?UTF-8?q?p=20versions=20and=20switch=20to=20pre-built=20images?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - update php 8.1.32 to 8.1.33 with bookworm base image - update php 8.4.8 to 8.4.13 with bookworm base image - switch from local docker builds to pre-built ghcr.io images for all versions - maintain existing configuration files and environment samples --- .../7.4.33-alpine/docker-compose.yml | 4 +- apps/php-unofficial/7.4.33/docker-compose.yml | 4 +- .../{8.1.32 => 8.1.33}/.env.sample | 0 .../{8.1.32 => 8.1.33}/Dockerfile | 4 +- .../{8.1.32 => 8.1.33}/data.yml | 0 .../{8.1.32 => 8.1.33}/data/php-fpm.conf | 0 .../{8.1.32 => 8.1.33}/data/php.ini | 0 .../{8.1.32 => 8.1.33}/docker-compose.yml | 4 +- .../{8.4.8 => 8.4.13}/.env.sample | 0 .../{8.4.8 => 8.4.13}/Dockerfile | 24 +++++------ .../php-unofficial/{8.4.8 => 8.4.13}/data.yml | 0 .../{8.4.8 => 8.4.13}/data/php-fpm.conf | 0 .../{8.4.8 => 8.4.13}/data/php.ini | 0 .../{8.4.8 => 8.4.13}/docker-compose.yml | 6 +-- .../php-unofficial/{data.yml.bak => data.yml} | 40 +++++++++---------- 15 files changed, 37 insertions(+), 49 deletions(-) rename apps/php-unofficial/{8.1.32 => 8.1.33}/.env.sample (100%) rename apps/php-unofficial/{8.1.32 => 8.1.33}/Dockerfile (98%) rename apps/php-unofficial/{8.1.32 => 8.1.33}/data.yml (100%) rename apps/php-unofficial/{8.1.32 => 8.1.33}/data/php-fpm.conf (100%) rename apps/php-unofficial/{8.1.32 => 8.1.33}/data/php.ini (100%) rename apps/php-unofficial/{8.1.32 => 8.1.33}/docker-compose.yml (86%) rename apps/php-unofficial/{8.4.8 => 8.4.13}/.env.sample (100%) rename apps/php-unofficial/{8.4.8 => 8.4.13}/Dockerfile (86%) rename apps/php-unofficial/{8.4.8 => 8.4.13}/data.yml (100%) rename apps/php-unofficial/{8.4.8 => 8.4.13}/data/php-fpm.conf (100%) rename apps/php-unofficial/{8.4.8 => 8.4.13}/data/php.ini (100%) rename apps/php-unofficial/{8.4.8 => 8.4.13}/docker-compose.yml (84%) rename apps/php-unofficial/{data.yml.bak => data.yml} (96%) diff --git a/apps/php-unofficial/7.4.33-alpine/docker-compose.yml b/apps/php-unofficial/7.4.33-alpine/docker-compose.yml index db58ed7c9..00827b22f 100644 --- a/apps/php-unofficial/7.4.33-alpine/docker-compose.yml +++ b/apps/php-unofficial/7.4.33-alpine/docker-compose.yml @@ -1,8 +1,6 @@ services: php74a: - build: - context: . - dockerfile: Dockerfile + image: ghcr.io/pooneyy/php:7.4.33-fpm-alpine-php-unofficial container_name: ${CONTAINER_NAME} restart: always networks: diff --git a/apps/php-unofficial/7.4.33/docker-compose.yml b/apps/php-unofficial/7.4.33/docker-compose.yml index ec22ad653..dd8a5dd41 100644 --- a/apps/php-unofficial/7.4.33/docker-compose.yml +++ b/apps/php-unofficial/7.4.33/docker-compose.yml @@ -1,8 +1,6 @@ services: php74: - build: - context: . - dockerfile: Dockerfile + image: ghcr.io/pooneyy/php:7.4.33-fpm-php-unofficial container_name: ${CONTAINER_NAME} restart: always networks: diff --git a/apps/php-unofficial/8.1.32/.env.sample b/apps/php-unofficial/8.1.33/.env.sample similarity index 100% rename from apps/php-unofficial/8.1.32/.env.sample rename to apps/php-unofficial/8.1.33/.env.sample diff --git a/apps/php-unofficial/8.1.32/Dockerfile b/apps/php-unofficial/8.1.33/Dockerfile similarity index 98% rename from apps/php-unofficial/8.1.32/Dockerfile rename to apps/php-unofficial/8.1.33/Dockerfile index 49a67bf4e..ff19fed61 100644 --- a/apps/php-unofficial/8.1.32/Dockerfile +++ b/apps/php-unofficial/8.1.33/Dockerfile @@ -1,6 +1,6 @@ #Reference Links ：https://github.com/docker-library/php/issues/926#issuecomment-567230723 -FROM php:8.1.33-fpm +FROM php:8.1.33-fpm-bookworm ARG UNAME=www-data ARG UGROUP=www-data @@ -91,5 +91,3 @@ RUN docker-php-ext-enable imagick RUN echo "extension=redis.so" >> /usr/local/etc/php/php.ini WORKDIR /www - - diff --git a/apps/php-unofficial/8.1.32/data.yml b/apps/php-unofficial/8.1.33/data.yml similarity index 100% rename from apps/php-unofficial/8.1.32/data.yml rename to apps/php-unofficial/8.1.33/data.yml diff --git a/apps/php-unofficial/8.1.32/data/php-fpm.conf b/apps/php-unofficial/8.1.33/data/php-fpm.conf similarity index 100% rename from apps/php-unofficial/8.1.32/data/php-fpm.conf rename to apps/php-unofficial/8.1.33/data/php-fpm.conf diff --git a/apps/php-unofficial/8.1.32/data/php.ini b/apps/php-unofficial/8.1.33/data/php.ini similarity index 100% rename from apps/php-unofficial/8.1.32/data/php.ini rename to apps/php-unofficial/8.1.33/data/php.ini diff --git a/apps/php-unofficial/8.1.32/docker-compose.yml b/apps/php-unofficial/8.1.33/docker-compose.yml similarity index 86% rename from apps/php-unofficial/8.1.32/docker-compose.yml rename to apps/php-unofficial/8.1.33/docker-compose.yml index 33bb0afc4..f437d1d3b 100644 --- a/apps/php-unofficial/8.1.32/docker-compose.yml +++ b/apps/php-unofficial/8.1.33/docker-compose.yml @@ -1,8 +1,6 @@ services: php81: - build: - context: . - dockerfile: Dockerfile + image: ghcr.io/pooneyy/php:8.1.33-fpm-bookworm-php-unofficial container_name: ${CONTAINER_NAME} restart: always networks: diff --git a/apps/php-unofficial/8.4.8/.env.sample b/apps/php-unofficial/8.4.13/.env.sample similarity index 100% rename from apps/php-unofficial/8.4.8/.env.sample rename to apps/php-unofficial/8.4.13/.env.sample diff --git a/apps/php-unofficial/8.4.8/Dockerfile b/apps/php-unofficial/8.4.13/Dockerfile similarity index 86% rename from apps/php-unofficial/8.4.8/Dockerfile rename to apps/php-unofficial/8.4.13/Dockerfile index 2d42c3e37..bbc8d6194 100644 --- a/apps/php-unofficial/8.4.8/Dockerfile +++ b/apps/php-unofficial/8.4.13/Dockerfile @@ -1,6 +1,6 @@ #Reference Links ：https://github.com/docker-library/php/issues/926#issuecomment-567230723 -FROM php:8.4.13-fpm +FROM php:8.4.13-fpm-bookworm ARG UNAME=www-data ARG UGROUP=www-data @@ -42,19 +42,21 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libicu-dev && \ rm -rf /var/lib/apt/lists/* - - # memcached -RUN pecl install memcached -RUN docker-php-ext-enable memcached +RUN pecl install memcached && \ + docker-php-ext-enable memcached # mcrypt -RUN pecl install mcrypt -RUN docker-php-ext-enable mcrypt +RUN pecl install mcrypt && \ + docker-php-ext-enable mcrypt # redis -RUN pecl install redis -RUN docker-php-ext-enable redis +RUN pecl install redis && \ + docker-php-ext-enable redis + +# imap +RUN pecl install imap && \ + docker-php-ext-enable imap #pecl temporarily does not support PHP8.1 api installation rar #Reference Links ：https://stackoverflow.com/questions/73564424/error-while-installing-php-rar-extension-on-ubuntu-server @@ -68,14 +70,12 @@ RUN docker-php-ext-configure gd --enable-gd --with-freetype --with-jpeg --with-w && docker-php-ext-configure mysqli --with-mysqli=mysqlnd \ && docker-php-ext-configure pdo_mysql --with-pdo-mysql=mysqlnd \ && docker-php-ext-configure zip \ -&& docker-php-ext-configure imap --with-kerberos --with-imap-ssl \ && docker-php-ext-install -j "$(nproc)" \ gd \ intl \ mysqli \ pdo_mysql \ zip \ - imap \ fileinfo \ xsl \ bcmath \ @@ -91,5 +91,3 @@ RUN docker-php-ext-enable imagick RUN echo "extension=redis.so" >> /usr/local/etc/php/php.ini WORKDIR /www - - diff --git a/apps/php-unofficial/8.4.8/data.yml b/apps/php-unofficial/8.4.13/data.yml similarity index 100% rename from apps/php-unofficial/8.4.8/data.yml rename to apps/php-unofficial/8.4.13/data.yml diff --git a/apps/php-unofficial/8.4.8/data/php-fpm.conf b/apps/php-unofficial/8.4.13/data/php-fpm.conf similarity index 100% rename from apps/php-unofficial/8.4.8/data/php-fpm.conf rename to apps/php-unofficial/8.4.13/data/php-fpm.conf diff --git a/apps/php-unofficial/8.4.8/data/php.ini b/apps/php-unofficial/8.4.13/data/php.ini similarity index 100% rename from apps/php-unofficial/8.4.8/data/php.ini rename to apps/php-unofficial/8.4.13/data/php.ini diff --git a/apps/php-unofficial/8.4.8/docker-compose.yml b/apps/php-unofficial/8.4.13/docker-compose.yml similarity index 84% rename from apps/php-unofficial/8.4.8/docker-compose.yml rename to apps/php-unofficial/8.4.13/docker-compose.yml index 33bb0afc4..9f4afd686 100644 --- a/apps/php-unofficial/8.4.8/docker-compose.yml +++ b/apps/php-unofficial/8.4.13/docker-compose.yml @@ -1,8 +1,6 @@ services: - php81: - build: - context: . - dockerfile: Dockerfile + php84: + image: ghcr.io/pooneyy/php:8.4.13-fpm-bookworm-php-unofficial container_name: ${CONTAINER_NAME} restart: always networks: diff --git a/apps/php-unofficial/data.yml.bak b/apps/php-unofficial/data.yml similarity index 96% rename from apps/php-unofficial/data.yml.bak rename to apps/php-unofficial/data.yml index c5d115d94..e6e7a4d99 100644 --- a/apps/php-unofficial/data.yml.bak +++ b/apps/php-unofficial/data.yml @@ -1,20 +1,20 @@ -name: PHP-Unofficial -tags: - - 工具 -title: PHP是一种流行的服务器端脚本语言 -type: 工具 -description: PHP是一种流行的服务器端脚本语言 -additionalProperties: - key: php-unofficial - name: PHP-Unofficial - tags: - - Tool - shortDescZh: PHP是一种流行的服务器端脚本语言 - shortDescEn: PHP is a popular server-side scripting language - type: tool - crossVersionUpdate: false - limit: 0 - recommend: 0 - website: https://www.php.net/ - github: https://github.com/php/php-src - document: https://www.php.net/docs.php +name: PHP-Unofficial +tags: + - 工具 +title: PHP是一种流行的服务器端脚本语言 +type: 工具 +description: PHP是一种流行的服务器端脚本语言 +additionalProperties: + key: php-unofficial + name: PHP-Unofficial + tags: + - Tool + shortDescZh: PHP是一种流行的服务器端脚本语言 + shortDescEn: PHP is a popular server-side scripting language + type: tool + crossVersionUpdate: false + limit: 0 + recommend: 0 + website: https://www.php.net/ + github: https://github.com/php/php-src + document: https://www.php.net/docs.php