From 0b222c321e8ea2d6928769fb0f5e169e799cb9f1 Mon Sep 17 00:00:00 2001 From: zhengkunwang223 Date: Wed, 5 Mar 2025 17:41:17 +0800 Subject: [PATCH] feat: update php extension install --- php/5/build/data/install-ext | 3 +++ php/7/build/Dockerfile | 16 +++++++++------- php/7/build/data/install-ext | 3 +++ php/8/build/data/install-ext | 3 +++ 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/php/5/build/data/install-ext b/php/5/build/data/install-ext index fd5d22b0e..00b6c8f43 100644 --- a/php/5/build/data/install-ext +++ b/php/5/build/data/install-ext @@ -149,6 +149,9 @@ install_yaf() { install_extension() { local extension=$1 + if [ -z "$extension" ]; then + return + fi if is_extension_installed "$extension"; then return fi diff --git a/php/7/build/Dockerfile b/php/7/build/Dockerfile index bd3b06c48..f05234ac2 100644 --- a/php/7/build/Dockerfile +++ b/php/7/build/Dockerfile @@ -4,13 +4,15 @@ FROM ${PHP_IMAGE} ARG PHP_EXTENSIONS ARG CONTAINER_PACKAGE_URL -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 +RUN if [ "${CONTAINER_PACKAGE_URL}" != "https://deb.debian.org" ]; then \ + 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; \ + fi COPY data/install-ext /usr/local/bin/ diff --git a/php/7/build/data/install-ext b/php/7/build/data/install-ext index f74bab8fb..5f4f138b0 100644 --- a/php/7/build/data/install-ext +++ b/php/7/build/data/install-ext @@ -124,6 +124,9 @@ install_yaf() { install_extension() { local extension=$1 + if [ -z "$extension" ]; then + return + fi if is_extension_installed "$extension"; then return fi diff --git a/php/8/build/data/install-ext b/php/8/build/data/install-ext index 555d146f5..6d841a395 100644 --- a/php/8/build/data/install-ext +++ b/php/8/build/data/install-ext @@ -149,6 +149,9 @@ install_yaf() { install_extension() { local extension=$1 + if [ -z "$extension" ]; then + return + fi if is_extension_installed "$extension"; then return fi