diff --git a/changelog.md b/changelog.md index 1a3053a..e311443 100644 --- a/changelog.md +++ b/changelog.md @@ -4,6 +4,9 @@ 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.7.2] - 2024-08-30 +* Fixed - Set the `opcache.revalidate_freq` to `0` in the `slic` and `wordpress` containers to avoid issues with cached files in tests. + # [1.7.1] - 2024-08-30 * Fixed - Run the `playwright install` command as root, allow running Playwright tests as the `slic` user. * Change - The `playwright install` command will now install only the Chromium browser and its dependencies. diff --git a/containers/slic/Dockerfile b/containers/slic/Dockerfile index 6ccbca6..bee8fe5 100644 --- a/containers/slic/Dockerfile +++ b/containers/slic/Dockerfile @@ -40,9 +40,6 @@ RUN apt-get update && apt-get upgrade -yqq && apt-get install -yqq --no-install- # Configure the uopz extension. COPY ./docker-php-ext-uopz.ini /usr/local/etc/php/conf.d/docker-php-ext-uopz.ini -# Use our own ini configuration file to set up some PHP default. -COPY ./php.ini /usr/local/etc/php/conf.d/999-slic.ini - # Add the XDebug control scripts. COPY ./xdebug-on.sh /usr/local/bin/xdebug-on COPY ./xdebug-off.sh /usr/local/bin/xdebug-off diff --git a/containers/slic/php.ini b/containers/slic/php.ini index 85ac348..7a1a249 100644 --- a/containers/slic/php.ini +++ b/containers/slic/php.ini @@ -20,3 +20,11 @@ xdebug.start_with_request=yes xdebug.mode=develop,debug,coverage xdebug.discover_client_host=1 xdebug.log_level=0 + +; Opcache +opcache.revalidate_freq=0 +opcache.validate_timestamps=1 +opcache.max_accelerated_files=25000 +opcache.memory_consumption=128 +opcache.interned_strings_buffer=16 + diff --git a/containers/wordpress/Dockerfile b/containers/wordpress/Dockerfile index b8e8cc6..153d5f0 100644 --- a/containers/wordpress/Dockerfile +++ b/containers/wordpress/Dockerfile @@ -11,8 +11,6 @@ RUN chmod a+x /usr/local/bin/xdebug-on && \ chmod a+x /usr/local/bin/xdebug-off && \ 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 # Install and make wp-cli binary available and executable by all users. ADD https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar /usr/local/bin/wp diff --git a/containers/wordpress/php.ini b/containers/wordpress/php.ini index 85ac348..9384500 100644 --- a/containers/wordpress/php.ini +++ b/containers/wordpress/php.ini @@ -20,3 +20,10 @@ xdebug.start_with_request=yes xdebug.mode=develop,debug,coverage xdebug.discover_client_host=1 xdebug.log_level=0 + +; Opcache +opcache.revalidate_freq=0 +opcache.validate_timestamps=1 +opcache.max_accelerated_files=25000 +opcache.memory_consumption=128 +opcache.interned_strings_buffer=16 diff --git a/slic-stack.yml b/slic-stack.yml index 191486c..f322a8b 100644 --- a/slic-stack.yml +++ b/slic-stack.yml @@ -108,6 +108,7 @@ services: - ${SLIC_PLUGINS_DIR}:/var/www/html/wp-content/plugins - ${SLIC_THEMES_DIR}:/var/www/html/wp-content/themes - ${COMPOSER_CACHE_DIR:-./.cache}:/composer-cache + - ./containers/wordpress/php.ini:/usr/local/etc/php/conf.d/zz-docker.ini healthcheck: # Apache service should be running correctly. test: service apache2 status start_period: 5s @@ -197,6 +198,8 @@ services: - ${COMPOSER_CACHE_DIR:-./.cache}:/composer-cache # Scripts volume - ${SLIC_SCRIPTS}:/slic-scripts + # Configurable php.ini volume + - ./containers/slic/php.ini:/usr/local/etc/php/conf.d/zz-docker.ini extra_hosts: # Set as host=host.docker.internal in src/slic.php on Linux for XDebug. - "${host:-host}:host-gateway" diff --git a/slic.php b/slic.php index 69829a6..f94f182 100644 --- a/slic.php +++ b/slic.php @@ -34,7 +34,7 @@ ] ); $cli_name = 'slic'; -const CLI_VERSION = '1.7.1'; +const CLI_VERSION = '1.7.2'; // 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 ) ) ) {