diff --git a/php/8/build/..env b/php/8/.env similarity index 100% rename from php/8/build/..env rename to php/8/.env diff --git a/php/8/build/php/Dockerfile b/php/8/build/Dockerfile similarity index 56% rename from php/8/build/php/Dockerfile rename to php/8/build/Dockerfile index 9e675c06a..25bd48d84 100644 --- a/php/8/build/php/Dockerfile +++ b/php/8/build/Dockerfile @@ -1,7 +1,13 @@ ARG PHP_IMAGE -ARG PHP_EXTENSIONS 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 + COPY data/install-ext /usr/local/bin/ RUN chmod uga+x /usr/local/bin/install-ext diff --git a/php/8/build/php/data/install-ext b/php/8/build/data/install-ext similarity index 99% rename from php/8/build/php/data/install-ext rename to php/8/build/data/install-ext index 4dd3b7ac7..be6cc7936 100644 --- a/php/8/build/php/data/install-ext +++ b/php/8/build/data/install-ext @@ -152,7 +152,6 @@ install_yaf() { install_msg yaf docker-php-ext-enable yaf } -apt-get update install_extension() { local extension=$1 @@ -272,6 +271,7 @@ install_extension() { } echo "${PHP_EXTENSIONS}" | tr ',' '\n' | while read -r extension; do + apt-get update install_extension $extension done diff --git a/php/8/build/docker-compose.yml b/php/8/build/docker-compose.yml deleted file mode 100644 index 80d7db17e..000000000 --- a/php/8/build/docker-compose.yml +++ /dev/null @@ -1,10 +0,0 @@ -services: - php: - build: - context: ./php - args: - PHP_IMAGE: 1panel/php::${PHP_VERSION}-fpm - CONTAINER_PACKAGE_URL: ${CONTAINER_PACKAGE_URL} - PHP_EXTENSIONS: ${PHP_EXTENSIONS} - TZ: ${TZ} - image: ${IMAGE_NAME} diff --git a/php/8/data.yml b/php/8/data.yml index 0123da18c..f8adf007b 100755 --- a/php/8/data.yml +++ b/php/8/data.yml @@ -1,5 +1,20 @@ additionalProperties: formFields: + - default: 8.3.8 + envKey: PHP_VERSION + labelEn: PHP Version + labelZh: PHP 版本 + required: true + type: select + values: + - label: "8.3.8" + value: "8.3.8" + - label: "8.2.20" + value: "8.2.20" + - label: "8.1.29" + value: "8.1.29" + - label: "8.0.30" + value: "8.0.30" - default: 9000 envKey: PANEL_APP_PORT_HTTP labelEn: PHP-FPM Port @@ -7,3 +22,4 @@ additionalProperties: required: true rule: paramPort type: number + \ No newline at end of file diff --git a/php/8/docker-compose.yml b/php/8/docker-compose.yml index 11e61e04c..fd33f5c71 100644 --- a/php/8/docker-compose.yml +++ b/php/8/docker-compose.yml @@ -1,5 +1,12 @@ services: php: + build: + context: ./build + args: + PHP_IMAGE: 1panel/php:${PHP_VERSION}-fpm + CONTAINER_PACKAGE_URL: ${CONTAINER_PACKAGE_URL} + PHP_EXTENSIONS: ${PHP_EXTENSIONS} + TZ: ${TZ} image: ${IMAGE_NAME} container_name: ${CONTAINER_NAME} restart: always