diff --git a/docker/php-fpm/Dockerfile b/docker/php-fpm/Dockerfile index 56b601b..eefc168 100644 --- a/docker/php-fpm/Dockerfile +++ b/docker/php-fpm/Dockerfile @@ -1,9 +1,11 @@ -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 && \ 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 . . 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';