diff --git a/changelog.md b/changelog.md index a65dbd7..6ca6f2d 100644 --- a/changelog.md +++ b/changelog.md @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +# [1.4.3] - 2023-08-03 + +* Change - Configure `slic` and `wordpress` containers consistently with `php.ini` configuration file. +* Change - Set `xdebug.log_level=0` in `slic` and `wordpress` containers to avoid nags in separate process running. + ## [1.4.2] - 2023-07-02 * Change - Enable xdebug coverage mode in all PHP based docker containers when xdebug is enabled via: `xdebug.mode=develop,debug,coverage`. diff --git a/containers/slic/Dockerfile b/containers/slic/Dockerfile index 7590412..7336492 100644 --- a/containers/slic/Dockerfile +++ b/containers/slic/Dockerfile @@ -47,8 +47,6 @@ RUN chmod a+x /usr/local/bin/xdebug-on && \ # Make the PHP configuration directory recursively readable and writable to allow all users to activate and deactivate XDebug. RUN chmod -R a+rwx /usr/local/etc/php/conf.d -RUN echo "xdebug.mode=develop,debug,coverage" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini && \ - echo "xdebug.start_with_request=yes" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini RUN xdebug-off # Install nvm. diff --git a/containers/slic/php.ini b/containers/slic/php.ini index 8eb1699..85ac348 100644 --- a/containers/slic/php.ini +++ b/containers/slic/php.ini @@ -19,3 +19,4 @@ max_execution_time=300 xdebug.start_with_request=yes xdebug.mode=develop,debug,coverage xdebug.discover_client_host=1 +xdebug.log_level=0 diff --git a/containers/wordpress/Dockerfile b/containers/wordpress/Dockerfile index c046a6e..b823ea1 100644 --- a/containers/wordpress/Dockerfile +++ b/containers/wordpress/Dockerfile @@ -9,7 +9,7 @@ COPY xdebug-on.sh /usr/local/bin/xdebug-on COPY xdebug-off.sh /usr/local/bin/xdebug-off RUN chmod a+x /usr/local/bin/xdebug-on && \ chmod a+x /usr/local/bin/xdebug-off && \ - echo "xdebug.mode=develop,debug,coverage" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini && \ - echo "xdebug.start_with_request=yes" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini && \ xdebug-off RUN chmod -R a+rwx /usr/local/etc/php/conf.d +# Use our own ini configuration file to set up some PHP default. +COPY ./php.ini /usr/local/etc/php/conf.d/999-slic.ini diff --git a/containers/wordpress/php.ini b/containers/wordpress/php.ini new file mode 100644 index 0000000..85ac348 --- /dev/null +++ b/containers/wordpress/php.ini @@ -0,0 +1,22 @@ +;Explicitly set a timezone to avoid PHP complaining about using the default one. +date.timezone="America/New_York" + +;Avoid populating the $HTTP_RAW_POST_DATA and getting a deprecated warning about it. +always_populate_raw_post_data=-1 + +;Set a fairly high memory limit to cope with Composer 1 needs. +memory_limit=512M + +;Allow fairly large uploads. +file_uploads=On +upload_max_filesize=128M +post_max_size=128M + +;Allow long request. +max_execution_time=300 + +;If XDebug is active, it should always start. +xdebug.start_with_request=yes +xdebug.mode=develop,debug,coverage +xdebug.discover_client_host=1 +xdebug.log_level=0 diff --git a/slic.php b/slic.php index 0178e60..d2063c0 100644 --- a/slic.php +++ b/slic.php @@ -33,7 +33,7 @@ ] ); $cli_name = 'slic'; -const CLI_VERSION = '1.4.2'; +const CLI_VERSION = '1.4.3'; // If the run-time option `-q`, for "quiet", is specified, then do not print the header. if ( in_array( '-q', $argv, true ) || ( in_array( 'exec', $argv, true ) && ! in_array( 'help', $argv, true ) ) ) {