From a13c184882d25d0de87b616937040d9f18a028ed Mon Sep 17 00:00:00 2001 From: Justin Frydman Date: Fri, 30 Aug 2024 09:56:23 -0600 Subject: [PATCH 1/3] Use a volume for php.ini, fix opcache in containers --- containers/slic/Dockerfile | 3 --- containers/slic/php.ini | 6 ++++++ containers/wordpress/Dockerfile | 2 -- containers/wordpress/php.ini | 6 ++++++ slic-stack.yml | 3 +++ 5 files changed, 15 insertions(+), 5 deletions(-) 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..ddd794e 100644 --- a/containers/slic/php.ini +++ b/containers/slic/php.ini @@ -20,3 +20,9 @@ xdebug.start_with_request=yes xdebug.mode=develop,debug,coverage xdebug.discover_client_host=1 xdebug.log_level=0 + +; Opcache +opcache.use_cwd=0 +opcache.enable_file_override=1 +opcache.file_update_protection=0 +opcache.revalidate_freq=0 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..ddd794e 100644 --- a/containers/wordpress/php.ini +++ b/containers/wordpress/php.ini @@ -20,3 +20,9 @@ xdebug.start_with_request=yes xdebug.mode=develop,debug,coverage xdebug.discover_client_host=1 xdebug.log_level=0 + +; Opcache +opcache.use_cwd=0 +opcache.enable_file_override=1 +opcache.file_update_protection=0 +opcache.revalidate_freq=0 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" From 60511afb4f4bbfa768dc9a08ea2e22e72fa51ed8 Mon Sep 17 00:00:00 2001 From: Justin Frydman Date: Fri, 30 Aug 2024 10:00:00 -0600 Subject: [PATCH 2/3] Improve opcache configuration --- containers/slic/php.ini | 5 +++++ containers/wordpress/php.ini | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/containers/slic/php.ini b/containers/slic/php.ini index ddd794e..6b3363a 100644 --- a/containers/slic/php.ini +++ b/containers/slic/php.ini @@ -26,3 +26,8 @@ opcache.use_cwd=0 opcache.enable_file_override=1 opcache.file_update_protection=0 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/php.ini b/containers/wordpress/php.ini index ddd794e..1ca6695 100644 --- a/containers/wordpress/php.ini +++ b/containers/wordpress/php.ini @@ -26,3 +26,7 @@ opcache.use_cwd=0 opcache.enable_file_override=1 opcache.file_update_protection=0 opcache.revalidate_freq=0 +opcache.validate_timestamps=1 +opcache.max_accelerated_files=25000 +opcache.memory_consumption=128 +opcache.interned_strings_buffer=16 From cfd3cf968ddaeda1c77ab5c11a62e035bdbad289 Mon Sep 17 00:00:00 2001 From: Justin Frydman Date: Fri, 30 Aug 2024 10:03:23 -0600 Subject: [PATCH 3/3] simplify opcache --- containers/slic/php.ini | 3 --- containers/wordpress/php.ini | 3 --- 2 files changed, 6 deletions(-) diff --git a/containers/slic/php.ini b/containers/slic/php.ini index 6b3363a..7a1a249 100644 --- a/containers/slic/php.ini +++ b/containers/slic/php.ini @@ -22,9 +22,6 @@ xdebug.discover_client_host=1 xdebug.log_level=0 ; Opcache -opcache.use_cwd=0 -opcache.enable_file_override=1 -opcache.file_update_protection=0 opcache.revalidate_freq=0 opcache.validate_timestamps=1 opcache.max_accelerated_files=25000 diff --git a/containers/wordpress/php.ini b/containers/wordpress/php.ini index 1ca6695..9384500 100644 --- a/containers/wordpress/php.ini +++ b/containers/wordpress/php.ini @@ -22,9 +22,6 @@ xdebug.discover_client_host=1 xdebug.log_level=0 ; Opcache -opcache.use_cwd=0 -opcache.enable_file_override=1 -opcache.file_update_protection=0 opcache.revalidate_freq=0 opcache.validate_timestamps=1 opcache.max_accelerated_files=25000