Fix debug container memory usage and slow xdebug performance

totara · Nov 19, 2024 · 1bee22c · 1bee22c
1 parent cf7d07a
commit 1bee22c
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 12 deletions.
diff --git a/php/php71-debug/Dockerfile b/php/php71-debug/Dockerfile
@@ -9,5 +9,7 @@ RUN echo "xdebug.remote_enable=1" >> /usr/local/etc/php/conf.d/xdebug.ini \
 # Set some sensible defaults
 RUN echo "pcov.enabled=1" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
     && echo "pcov.exclude='~(vendor|tests|node_modules|.git|client|.scannerwork)~'" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
-    && echo "pcov.initial.memory=1073741824" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
+    # The next line can be enabled (and applied with tbuild and tup of this container) to optimise memory usage \
+    # Note that PHP's memory limit needs to be high enough.
+    #&& echo "pcov.initial.memory=1073741824" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
     && echo "pcov.initial.files=30000" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini
diff --git a/php/php72-debug/Dockerfile b/php/php72-debug/Dockerfile
@@ -9,5 +9,7 @@ RUN echo "xdebug.mode=debug" >> /usr/local/etc/php/conf.d/xdebug.ini \
 # Set some sensible defaults
 RUN echo "pcov.enabled=1" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
     && echo "pcov.exclude='~(vendor|tests|node_modules|.git|client|.scannerwork)~'" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
-    && echo "pcov.initial.memory=1073741824" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
+    # The next line can be enabled (and applied with tbuild and tup of this container) to optimise memory usage \
+    # Note that PHP's memory limit needs to be high enough.
+    #&& echo "pcov.initial.memory=1073741824" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
     && echo "pcov.initial.files=30000" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini
diff --git a/php/php73-debug/Dockerfile b/php/php73-debug/Dockerfile
@@ -9,5 +9,7 @@ RUN echo "xdebug.mode=debug" >> /usr/local/etc/php/conf.d/xdebug.ini \
 # Set some sensible defaults
 RUN echo "pcov.enabled=1" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
     && echo "pcov.exclude='~(vendor|tests|node_modules|.git|client|.scannerwork)~'" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
-    && echo "pcov.initial.memory=1073741824" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
+    # The next line can be enabled (and applied with tbuild and tup of this container) to optimise memory usage \
+    # Note that PHP's memory limit needs to be high enough.
+    #&& echo "pcov.initial.memory=1073741824" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
     && echo "pcov.initial.files=30000" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini
diff --git a/php/php74-debug/Dockerfile b/php/php74-debug/Dockerfile
@@ -9,5 +9,7 @@ RUN echo "xdebug.mode=debug" >> /usr/local/etc/php/conf.d/xdebug.ini \
 # Set some sensible defaults
 RUN echo "pcov.enabled=1" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
     && echo "pcov.exclude='~(vendor|tests|node_modules|.git|client|.scannerwork)~'" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
-    && echo "pcov.initial.memory=1073741824" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
+    # The next line can be enabled (and applied with tbuild and tup of this container) to optimise memory usage \
+    # Note that PHP's memory limit needs to be high enough.
+    #&& echo "pcov.initial.memory=1073741824" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
     && echo "pcov.initial.files=30000" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini
diff --git a/php/php80-debug/Dockerfile b/php/php80-debug/Dockerfile
@@ -1,6 +1,6 @@
 FROM totara/docker-dev-php80:latest
 
-RUN pecl install -f xdebug-3.3.2 && docker-php-ext-enable xdebug.so
+RUN pecl install -f xdebug-3.4.0beta1 && docker-php-ext-enable xdebug.so
 RUN pecl install -f pcov && docker-php-ext-enable pcov.so
 
 RUN echo "xdebug.mode=debug" >> /usr/local/etc/php/conf.d/xdebug.ini \
@@ -9,5 +9,7 @@ RUN echo "xdebug.mode=debug" >> /usr/local/etc/php/conf.d/xdebug.ini \
 # Set some sensible defaults
 RUN echo "pcov.enabled=1" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
     && echo "pcov.exclude='~(vendor|tests|node_modules|.git|client|.scannerwork)~'" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
-    && echo "pcov.initial.memory=1073741824" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
+    # The next line can be enabled (and applied with tbuild and tup of this container) to optimise memory usage \
+    # Note that PHP's memory limit needs to be high enough.
+    #&& echo "pcov.initial.memory=1073741824" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
     && echo "pcov.initial.files=30000" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini
diff --git a/php/php81-debug/Dockerfile b/php/php81-debug/Dockerfile
@@ -1,6 +1,6 @@
 FROM totara/docker-dev-php81:latest
 
-RUN pecl install -f xdebug-3.3.2 && docker-php-ext-enable xdebug.so
+RUN pecl install -f xdebug-3.4.0beta1 && docker-php-ext-enable xdebug.so
 RUN pecl install -f pcov && docker-php-ext-enable pcov.so
 
 RUN echo "xdebug.mode=debug" >> /usr/local/etc/php/conf.d/xdebug.ini \
@@ -9,5 +9,7 @@ RUN echo "xdebug.mode=debug" >> /usr/local/etc/php/conf.d/xdebug.ini \
 # Set some sensible defaults
 RUN echo "pcov.enabled=1" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
     && echo "pcov.exclude='~(vendor|tests|node_modules|.git|client|.scannerwork)~'" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
-    && echo "pcov.initial.memory=1073741824" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
+    # The next line can be enabled (and applied with tbuild and tup of this container) to optimise memory usage \
+    # Note that PHP's memory limit needs to be high enough.
+    #&& echo "pcov.initial.memory=1073741824" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
     && echo "pcov.initial.files=30000" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini
diff --git a/php/php82-debug/Dockerfile b/php/php82-debug/Dockerfile
@@ -1,6 +1,6 @@
 FROM totara/docker-dev-php82:latest
 
-RUN pecl install -f xdebug-3.3.2 && docker-php-ext-enable xdebug.so
+RUN pecl install -f xdebug-3.4.0beta1 && docker-php-ext-enable xdebug.so
 RUN pecl install -f pcov && docker-php-ext-enable pcov.so
 
 RUN echo "xdebug.mode=debug" >> /usr/local/etc/php/conf.d/xdebug.ini \
@@ -9,5 +9,7 @@ RUN echo "xdebug.mode=debug" >> /usr/local/etc/php/conf.d/xdebug.ini \
 # Set some sensible defaults
 RUN echo "pcov.enabled=1" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
     && echo "pcov.exclude='~(vendor|tests|node_modules|.git|client|.scannerwork)~'" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
-    && echo "pcov.initial.memory=1073741824" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
+    # The next line can be enabled (and applied with tbuild and tup of this container) to optimise memory usage \
+    # Note that PHP's memory limit needs to be high enough.
+    #&& echo "pcov.initial.memory=1073741824" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
     && echo "pcov.initial.files=30000" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini
diff --git a/php/php83-debug/Dockerfile b/php/php83-debug/Dockerfile
@@ -1,6 +1,6 @@
 FROM totara/docker-dev-php83:latest
 
-RUN pecl install -f xdebug-3.3.2 && docker-php-ext-enable xdebug.so
+RUN pecl install -f xdebug-3.4.0beta1 && docker-php-ext-enable xdebug.so
 RUN pecl install -f pcov && docker-php-ext-enable pcov.so
 
 RUN echo "xdebug.mode=debug" >> /usr/local/etc/php/conf.d/xdebug.ini \
@@ -9,5 +9,7 @@ RUN echo "xdebug.mode=debug" >> /usr/local/etc/php/conf.d/xdebug.ini \
 # Set some sensible defaults
 RUN echo "pcov.enabled=1" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
     && echo "pcov.exclude='~(vendor|tests|node_modules|.git|client|.scannerwork)~'" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
-    && echo "pcov.initial.memory=1073741824" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
+    # The next line can be enabled (and applied with tbuild and tup of this container) to optimise memory usage \
+    # Note that PHP's memory limit needs to be high enough.
+    #&& echo "pcov.initial.memory=1073741824" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini \
     && echo "pcov.initial.files=30000" >> /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini