From c0f3c8d87a9728543e82c8c65477f3915f557f8b Mon Sep 17 00:00:00 2001 From: zhengkunwang223 Date: Mon, 9 Sep 2024 19:19:02 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=20PHP=20=E6=89=A9?= =?UTF-8?q?=E5=B1=95=E5=AE=89=E8=A3=85=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- php/7/.env | 2 +- php/7/build/Dockerfile | 11 ++++++++--- php/7/build/data/install-ext | 10 ++++------ php/8/build/Dockerfile | 1 - php/8/build/data/install-ext | 4 +--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/php/7/.env b/php/7/.env index a87e8a450..431d49140 100644 --- a/php/7/.env +++ b/php/7/.env @@ -3,4 +3,4 @@ CONTAINER_PACKAGE_URL= PHP_EXTENSIONS= IMAGE_NAME= TZ="Asia/Shanghai" -EXTENSION_DIR="/usr/local/lib/php/extensions/no-debug-non-zts-20230831" +EXTENSION_DIR="/usr/local/lib/php/extensions/no-debug-non-zts-20190902" diff --git a/php/7/build/Dockerfile b/php/7/build/Dockerfile index 01af54be1..bd3b06c48 100644 --- a/php/7/build/Dockerfile +++ b/php/7/build/Dockerfile @@ -4,9 +4,14 @@ FROM ${PHP_IMAGE} ARG PHP_EXTENSIONS ARG CONTAINER_PACKAGE_URL -RUN sed -i "s|URIs: http://deb.debian.org/debian|URIs: ${CONTAINER_PACKAGE_URL}/debian|g" /etc/apt/sources.list.d/debian.sources && \ - cat /etc/apt/sources.list.d/debian.sources && \ - apt-get update +RUN sed -i \ + -e "s|http://snapshot.debian.org/archive/debian|${CONTAINER_PACKAGE_URL}|g" \ + -e "s|http://deb.debian.org/debian|${CONTAINER_PACKAGE_URL}/debian|g" \ + -e "s|http://snapshot.debian.org/archive/debian-security|${CONTAINER_PACKAGE_URL}|g" \ + -e "s|http://deb.debian.org/debian-security|${CONTAINER_PACKAGE_URL}/debian-security|g" \ + /etc/apt/sources.list && \ + apt-get update + COPY data/install-ext /usr/local/bin/ RUN chmod uga+x /usr/local/bin/install-ext diff --git a/php/7/build/data/install-ext b/php/7/build/data/install-ext index a6a524158..03425bf7d 100644 --- a/php/7/build/data/install-ext +++ b/php/7/build/data/install-ext @@ -200,9 +200,7 @@ install_extension() { elif [ "$extension" = "sysvshm" ]; then docker_php_ext_install sysvshm elif [ "$extension" = "calendar" ]; then - docker_php_ext_install calendar - elif [ "$extension" = "zmq" ]; then - docker_php_ext_install zmq + docker_php_ext_install calendar elif [ "$extension" = "sodium" ]; then apt-get install -y libsodium-dev docker_php_ext_install sodium @@ -277,12 +275,12 @@ install_extension() { install_php_extensions pspell elif [ "$extension" = "bz2" ]; then install_php_extensions bz2 - elif [ "$extension" = "zmq" ]; then - install_php_extensions zmq elif [ "$extension" = "smbclient" ]; then install_php_extensions smbclient elif [ "$extension" = "event" ]; then - install_php_extensions event + install_php_extensions event + elif [ "$extension" = "zmq" ]; then + install_php_extensions zmq else install_extension_default $extension fi diff --git a/php/8/build/Dockerfile b/php/8/build/Dockerfile index 01af54be1..e27b2bb8e 100644 --- a/php/8/build/Dockerfile +++ b/php/8/build/Dockerfile @@ -5,7 +5,6 @@ ARG PHP_EXTENSIONS ARG CONTAINER_PACKAGE_URL RUN sed -i "s|URIs: http://deb.debian.org/debian|URIs: ${CONTAINER_PACKAGE_URL}/debian|g" /etc/apt/sources.list.d/debian.sources && \ - cat /etc/apt/sources.list.d/debian.sources && \ apt-get update COPY data/install-ext /usr/local/bin/ diff --git a/php/8/build/data/install-ext b/php/8/build/data/install-ext index a6a524158..606e18475 100644 --- a/php/8/build/data/install-ext +++ b/php/8/build/data/install-ext @@ -200,9 +200,7 @@ install_extension() { elif [ "$extension" = "sysvshm" ]; then docker_php_ext_install sysvshm elif [ "$extension" = "calendar" ]; then - docker_php_ext_install calendar - elif [ "$extension" = "zmq" ]; then - docker_php_ext_install zmq + docker_php_ext_install calendar elif [ "$extension" = "sodium" ]; then apt-get install -y libsodium-dev docker_php_ext_install sodium