Fixes to xdebug3 and image clean up

Author: cableman

php7.3-fpm/alpine/etc/php-fpm.d/fpm.ini

@@ -14,3 +14,4 @@ pm.status_path = /status
 
 user = ${PHP_USER}
 group = ${PHP_GROUP}
+

php7.3-fpm/focal/Dockerfile

@@ -69,11 +69,6 @@ RUN pecl install mcrypt-1.0.2 \
 RUN yes '' | pecl install redis-4.3.0 \
 && /usr/sbin/phpenmod redis
 
-RUN sed -i '/memory_limit = 128M/c memory_limit = 256M' /etc/php/${PHP_VERSION}/fpm/php.ini \
-&& sed -i '/;date.timezone =/c date.timezone = Europe\/Copenhagen' /etc/php/${PHP_VERSION}/fpm/php.ini \
-&& sed -i '/upload_max_filesize = 2M/c upload_max_filesize = 16M' /etc/php/${PHP_VERSION}/fpm/php.ini \
-&& sed -i '/post_max_size = 8M/c post_max_size = 20M' /etc/php/${PHP_VERSION}/fpm/php.ini
-
 # Install composer (both composer version as set symlink to right version in entry-point)
 ADD https://getcomposer.org/composer.phar /usr/local/bin/composer1
 ADD https://getcomposer.org/composer.phar /usr/local/bin/composer2

php7.3-fpm/focal/etc/confd/templates/20-xdebug.ini.tmpl

@@ -2,6 +2,11 @@
 {{ if ne $mode "off"}}
 zend_extension=xdebug.so
 xdebug.max_nesting_level = {{ getenv "XDEBUG_MAX_NESTING_LEVEL" "256" }}
+{{$session := getenv "XDEBUG_SESSION" }}
+{{ if eq $session "1" }}
+xdebug.client_host = {{ getenv "XDEBUG_CLIENT_HOST" "host.docker.internal" }}
+xdebug.start_with_request = {{ getenv "XDEBUG_WITH_REQUEST" "yes" }}
+{{ end }}
 
 {{ if eq $mode "profile"}}
 xdebug.profiler_append = {{ getenv "XDEBUG_PROFILER_APPEND" "0" }}

php7.4-fpm/focal/Dockerfile

@@ -67,11 +67,6 @@ COPY etc/ /etc/
 RUN yes '' | pecl install redis-4.3.0 \
 && /usr/sbin/phpenmod redis
 
-RUN sed -i '/memory_limit = 128M/c memory_limit = 256M' /etc/php/${PHP_VERSION}/fpm/php.ini \
-&& sed -i '/;date.timezone =/c date.timezone = Europe\/Copenhagen' /etc/php/${PHP_VERSION}/fpm/php.ini \
-&& sed -i '/upload_max_filesize = 2M/c upload_max_filesize = 16M' /etc/php/${PHP_VERSION}/fpm/php.ini \
-&& sed -i '/post_max_size = 8M/c post_max_size = 20M' /etc/php/${PHP_VERSION}/fpm/php.ini
-
 # Install composer (both composer version as set symlink to right version in entry-point)
 ADD https://getcomposer.org/composer.phar /usr/local/bin/composer1
 ADD https://getcomposer.org/composer.phar /usr/local/bin/composer2

php7.4-fpm/focal/etc/confd/templates/20-xdebug.ini.tmpl

@@ -2,6 +2,11 @@
 {{ if ne $mode "off"}}
 zend_extension=xdebug.so
 xdebug.max_nesting_level = {{ getenv "XDEBUG_MAX_NESTING_LEVEL" "256" }}
+{{$session := getenv "XDEBUG_SESSION" }}
+{{ if eq $session "1" }}
+xdebug.client_host = {{ getenv "XDEBUG_CLIENT_HOST" "host.docker.internal" }}
+xdebug.start_with_request = {{ getenv "XDEBUG_WITH_REQUEST" "yes" }}
+{{ end }}
 
 {{ if eq $mode "profile"}}
 xdebug.profiler_append = {{ getenv "XDEBUG_PROFILER_APPEND" "0" }}