From 97480f993b0624015dc9e190d89a0c93768cdae1 Mon Sep 17 00:00:00 2001 From: "Arnaud G. GIBERT" Date: Mon, 26 Oct 2026 11:34:50 +0100 Subject: [PATCH] - Add PHP_DISABLED_FUNCTIONS environment variable. --- Dockerfile | 7 ++++--- ReleaseNotes.txt | 8 ++++++++ compose.yaml | 2 ++ env.dist | 9 +++++++-- 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 36af0cb..6d511b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -43,9 +43,10 @@ done [[ "${PHP_MEMORY_LIMIT}" == "" ]] && PHP_MEMORY_LIMIT="512M" \n\ [[ "${PHP_UPLOAD_LIMIT}" == "" ]] && PHP_UPLOAD_LIMIT="32M" \n\ \n\ -sed -i -e "s/memory_limit = 128M/memory_limit = ${PHP_MEMORY_LIMIT}/" /etc/php.d/01_ressourcelimits.ini \n\ -sed -i -e "s/upload_max_filesize = 16M/upload_max_filesize = ${PHP_UPLOAD_LIMIT}/" /etc/php.d/01_fileuploads.ini \n\ -sed -i -e "s/post_max_size = 8M/post_max_size = ${PHP_UPLOAD_LIMIT}/" /etc/php.d/01_datahandling.ini \n\ +sed -i -e "s/memory_limit = 128M/memory_limit = ${PHP_MEMORY_LIMIT}/" /etc/php.d/01_ressourcelimits.ini \n\ +sed -i -e "s/upload_max_filesize = 16M/upload_max_filesize = ${PHP_UPLOAD_LIMIT}/" /etc/php.d/01_fileuploads.ini \n\ +sed -i -e "s/post_max_size = 8M/post_max_size = ${PHP_UPLOAD_LIMIT}/" /etc/php.d/01_datahandling.ini \n\ +sed -i -e "s/disable_functions =/disable_functions = ${PHP_DISABLED_FUNCTIONS}/" /etc/php.d/01_language.ini \n\ \n\ # HTTPD enabled by default \n\ if [[ "${APACHE_HTTPD_ENABLED}" == "FALSE" ]] \n\ diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 40e3533..810106a 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,11 @@ +------------------------------------------------------------------------------------------------------------------------------------ +Rx3-Docker/PHP-Apache V 1.7.2 - A. GIBERT - 2026/10/26 +------------------------------------------------------------------------------------------------------------------------------------ + +- Add PHP_DISABLED_FUNCTIONS environment variable. + + + ------------------------------------------------------------------------------------------------------------------------------------ Rx3-Docker/PHP-Apache V 1.7.1 - A. GIBERT - 2026/10/21 ------------------------------------------------------------------------------------------------------------------------------------ diff --git a/compose.yaml b/compose.yaml index 99f89ef..c122b91 100644 --- a/compose.yaml +++ b/compose.yaml @@ -29,12 +29,14 @@ services: restart: unless-stopped environment: + SERVER_CROND_ENABLED: ${WA_SERVER_CROND_ENABLED} APACHE_UID: ${WA_USER_ID} APACHE_GID: ${WA_GROUP_ID} APACHE_DOC_ROOT: ${WA_DOC_ROOT} APACHE_HTTPD_ENABLED: ${WA_APACHE_HTTPD_ENABLED} PHP_MEMORY_LIMIT: ${WA_PHP_MEMORY_LIMIT} PHP_UPLOAD_LIMIT: ${WA_PHP_UPLOAD_LIMIT} + PHP_DISABLED_FUNCTIONS: ${WA_PHP_DISABLED_FUNCTIONS} healthcheck: test: ["CMD", "curl", "-f", "http://localhost:${WA_PORT_MAIN_INT}"] diff --git a/env.dist b/env.dist index 2c85323..304add9 100644 --- a/env.dist +++ b/env.dist @@ -39,7 +39,7 @@ DOCKER_TOOLS_EXEPTION_LIBS="httpd:/var/www/html" # | Prefix | Name | URL Prefix | Name | Name Full | Version | URL Prefix | Name | Version | Name | Version | Ext | Int | Ext | Int | Name / Id | Name / Id | #------------------+----------+--------------------------+--------------------+------------------+-------------------------------+-----------------+--------------------+---------------+------------+--------------+------------+-------+-------+-------+-------+--------------+--------------+ -docker_service_add WA webapp ${ORG_URL_PREFIX} php-apache "Rx3-Docker/PHP-Apache" 1.7.1-mga9 ${ORG_URL_PREFIX} server 1.4.0-mga9 httpd - 8080 80 - - apache apache +docker_service_add WA webapp ${ORG_URL_PREFIX} php-apache "Rx3-Docker/PHP-Apache" 1.7.2-mga9 ${ORG_URL_PREFIX} server 1.4.0-mga9 httpd - 8080 80 - - apache apache @@ -47,9 +47,14 @@ docker_service_add WA webapp ${ORG_URL_PREFIX} # User Settings #------------------------------------------------------------------------------- -SERVER_CROND_ENABLED="FALSE" +WA_SERVER_CROND_ENABLED="FALSE" WA_DOC_ROOT="/var/www/html" + WA_APACHE_HTTPD_ENABLED="TRUE" + WA_PHP_MEMORY_LIMIT="512M" WA_PHP_UPLOAD_LIMIT="32M" + +#WA_PHP_DISABLED_FUNCTIONS="phpinfo" +WA_PHP_DISABLED_FUNCTIONS=""