From 10c9e545d0c5fea926101cbabbd3c1c841ac0b2a Mon Sep 17 00:00:00 2001 From: Fabian Hufenreuter Date: Fri, 10 Jan 2025 13:22:30 +0100 Subject: [PATCH 1/3] unloy use major.minor for php fpm --- docker/php-fpm/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/php-fpm/Dockerfile b/docker/php-fpm/Dockerfile index 56b601b..996fe2d 100644 --- a/docker/php-fpm/Dockerfile +++ b/docker/php-fpm/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.4.1-fpm-bullseye +FROM php:8.4-fpm-bullseye RUN apt-get update && \ apt-get --no-install-recommends -y install iputils-ping mtr traceroute iproute2 && \ From 05ea20c33213a4fe774572223f868b0e3aaf7c42 Mon Sep 17 00:00:00 2001 From: Fabian Hufenreuter Date: Fri, 10 Jan 2025 13:23:29 +0100 Subject: [PATCH 2/3] add use of production php.ini --- docker/php-fpm/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/php-fpm/Dockerfile b/docker/php-fpm/Dockerfile index 996fe2d..eefc168 100644 --- a/docker/php-fpm/Dockerfile +++ b/docker/php-fpm/Dockerfile @@ -4,6 +4,8 @@ RUN apt-get update && \ apt-get --no-install-recommends -y install iputils-ping mtr traceroute iproute2 && \ rm -rf /var/lib/apt/lists/* +RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" + WORKDIR /var/www/html COPY --chown=www-data:www-data . . From cbb1a95b64fddca2b4dada8ec701bad57aecd7bd Mon Sep 17 00:00:00 2001 From: Fabian Hufenreuter Date: Fri, 10 Jan 2025 13:24:08 +0100 Subject: [PATCH 3/3] change $_ENV to getenv --- docker/php-fpm/src/config.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/php-fpm/src/config.php b/docker/php-fpm/src/config.php index 02ad439..6e46471 100644 --- a/docker/php-fpm/src/config.php +++ b/docker/php-fpm/src/config.php @@ -23,11 +23,11 @@ const LG_CSS_OVERRIDES = false; const LG_CUSTOM_HEAD = false; // Enable or disable blocks/parts of the LG, pass these environment variables with any value to disable them; -define('LG_BLOCK_NETWORK', !isset($_ENV['DISABLE_BLOCK_NETWORK'])); -define('LG_BLOCK_LOOKINGGLASS', !isset($_ENV['DISABLE_BLOCK_LOOKINGGLASS'])); -define('LG_BLOCK_SPEEDTEST', !isset($_ENV['DISABLE_BLOCK_SPEEDTEST'])); +define('LG_BLOCK_NETWORK', !getenv('DISABLE_BLOCK_NETWORK')); +define('LG_BLOCK_LOOKINGGLASS', !getenv('DISABLE_BLOCK_LOOKINGGLASS')); +define('LG_BLOCK_SPEEDTEST', !getenv('DISABLE_BLOCK_SPEEDTEST')); // This enables the custom block, which you can use to add something custom to the LG; -define('LG_BLOCK_CUSTOM', isset($_ENV['ENABLE_CUSTOM_BLOCK'])); +define('LG_BLOCK_CUSTOM', getenv('ENABLE_CUSTOM_BLOCK')); // Define a file here which will be used to display the custom block, can be PHP too which outputs HTML; const LG_CUSTOM_HTML = __DIR__.'/custom.html.php';