From c04b036ed7d9c22b9e39b010f8cf8cc7a80e6c72 Mon Sep 17 00:00:00 2001 From: zhengkunwang223 <1paneldev@sina.com> Date: Fri, 9 May 2025 15:01:37 +0800 Subject: [PATCH] feat: update php Dockerfile --- php/7/build/Dockerfile | 2 -- php/7/build/data/install-ext | 3 +-- php/8/build/Dockerfile | 2 -- php/8/build/data/install-ext | 4 +--- 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/php/7/build/Dockerfile b/php/7/build/Dockerfile index d6766804a..8e38aab31 100644 --- a/php/7/build/Dockerfile +++ b/php/7/build/Dockerfile @@ -21,8 +21,6 @@ RUN chmod uga+x /usr/local/bin/install-ext ENV PHP_INI_SCAN_DIR=/usr/local/etc/php/conf.d -RUN install-ext ${PHP_EXTENSIONS} - RUN pear config-set php_ini /usr/local/etc/php/php.ini RUN usermod -u 1000 www-data && groupmod -g 1000 www-data diff --git a/php/7/build/data/install-ext b/php/7/build/data/install-ext index 7b60535a0..731226991 100644 --- a/php/7/build/data/install-ext +++ b/php/7/build/data/install-ext @@ -207,8 +207,7 @@ install_extension() { apt-get update && apt-get install -y libzip-dev docker_php_ext_install zip elif [ "$extension" = "memcached" ]; then - apt-get update && apt-get install -y libmemcached-dev - pecl_install memcached + install_php_extensions memcached elif [ "$extension" = "igbinary" ]; then pecl_install igbinary elif [ "$extension" = "apcu" ]; then diff --git a/php/8/build/Dockerfile b/php/8/build/Dockerfile index 549eff8ab..c9238d151 100644 --- a/php/8/build/Dockerfile +++ b/php/8/build/Dockerfile @@ -14,8 +14,6 @@ RUN chmod uga+x /usr/local/bin/install-ext ENV PHP_INI_SCAN_DIR=/usr/local/etc/php/conf.d -RUN install-ext ${PHP_EXTENSIONS} - RUN pear config-set php_ini /usr/local/etc/php/php.ini RUN usermod -u 1000 www-data && groupmod -g 1000 www-data diff --git a/php/8/build/data/install-ext b/php/8/build/data/install-ext index f7ba5078b..fa5acecec 100644 --- a/php/8/build/data/install-ext +++ b/php/8/build/data/install-ext @@ -205,11 +205,9 @@ install_extension() { apt-get install -y libsodium-dev docker_php_ext_install sodium elif [ "$extension" = "zip" ]; then - apt-get update && apt-get install -y libzip-dev docker_php_ext_install zip elif [ "$extension" = "memcached" ]; then - apt-get update && apt-get install -y libmemcached-dev - pecl_install memcached + install_php_extensions memcached elif [ "$extension" = "igbinary" ]; then pecl_install igbinary elif [ "$extension" = "apcu" ]; then