Extra settings for PHP + missing config for Xdebug

================> EXTRAS <================ > Branch name: main
devdrops · Apr 5, 2024 · d59cdbf · d59cdbf
1 parent 4ce11c0
commit d59cdbf
Show file tree

Hide file tree

Showing 29 changed files with 94 additions and 28 deletions.
diff --git a/7.4/Dockerfile b/7.4/Dockerfile
@@ -23,7 +23,7 @@ EXPOSE 8081/tcp
 # Helper files
 COPY ./helpers/ /config/
 # Config and/or required files for PHP
-COPY ./config-files/error_reporting.ini /usr/local/etc/php/conf.d/error_reporting.ini
+COPY ./config-files/php/php.ini "${PHP_INI_DIR}/conf.d/app.ini"
 # Configuration files
 COPY ./config-files/ /config/
 

diff --git a/7.4/config-files/error_reporting.ini b/7.4/config-files/error_reporting.ini
diff --git a/7.4/config-files/php/php.ini b/7.4/config-files/php/php.ini
@@ -0,0 +1,11 @@
+[PHP]
+expose_php = On
+display_errors = On
+error_reporting=E_ALL
+display_startup_errors = On
+max_execution_time = 0
+default_socket_timeout = -1
+post_max_size = 10M
+upload_max_filesize = 10M
+max_file_uploads = 20
+memory_limit = 1G
diff --git a/7.4/config-files/xdebug/xdebug.ini b/7.4/config-files/xdebug/xdebug.ini
@@ -10,8 +10,9 @@ zend_extension=xdebug.so
 
 [xdebug]
 xdebug.mode=develop,coverage,debug,gcstats,profile,trace
-xdebug.discover_client_host=1
+xdebug.discover_client_host=0
 xdebug.client_host=host.docker.internal
+xdebug.client_port=9003
 xdebug.start_with_request=yes
 xdebug.profiler_enabled=1
 xdebug.output_dir=/tmp
@@ -20,6 +21,9 @@ xdebug.cli_color=1
 xdebug.show_error_trace=0
 xdebug.show_exception_trace=0
 xdebug.force_display_errors=1
+xdebug.max_nesting_level=250
+xdebug.var_display_max_data=10000
+xdebug.var_display_max_depth=20
 xdebug.log=/config/xdebug/xdebug.log
 xdebug.gc_stats_output_name=gcstats.%p.%u
 xdebug.profiler_output_name=cachegrind.out.%p.%u

diff --git a/7.4/helpers/xdebug/install.sh b/7.4/helpers/xdebug/install.sh
@@ -8,4 +8,4 @@
 pecl install -o -f xdebug-3.1.6
 docker-php-ext-enable xdebug
 rm -rf /tmp/pear
-cp /config/xdebug/xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+cp /config/xdebug/xdebug.ini "${PHP_INI_DIR}/conf.d/docker-php-ext-xdebug.ini"
diff --git a/8.0/Dockerfile b/8.0/Dockerfile
@@ -23,8 +23,8 @@ EXPOSE 8081/tcp
 # Helper files
 COPY ./helpers/ /config/
 # Config and/or required files for PHP
-COPY ./config-files/opcache.ini /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
-COPY ./config-files/error_reporting.ini /usr/local/etc/php/conf.d/error_reporting.ini
+COPY ./config-files/opcache/opcache.ini "${PHP_INI_DIR}/conf.d/docker-php-ext-opcache.ini"
+COPY ./config-files/php/php.ini "${PHP_INI_DIR}/conf.d/app.ini"
 # Configuration files
 COPY ./config-files/ /config/
 

diff --git a/8.0/config-files/error_reporting.ini b/8.0/config-files/error_reporting.ini
diff --git a/8.0/config-files/opcache.ini → 8.0/config-files/opcache/opcache.ini b/8.0/config-files/opcache.ini → 8.0/config-files/opcache/opcache.ini
diff --git a/8.0/config-files/php/php.ini b/8.0/config-files/php/php.ini
@@ -0,0 +1,11 @@
+[PHP]
+expose_php = On
+display_errors = On
+error_reporting=E_ALL
+display_startup_errors = On
+max_execution_time = 0
+default_socket_timeout = -1
+post_max_size = 10M
+upload_max_filesize = 10M
+max_file_uploads = 20
+memory_limit = 1G
diff --git a/8.0/config-files/xdebug/xdebug.ini b/8.0/config-files/xdebug/xdebug.ini
@@ -10,8 +10,9 @@ zend_extension=xdebug.so
 
 [xdebug]
 xdebug.mode=develop,coverage,debug,gcstats,profile,trace
-xdebug.discover_client_host=1
+xdebug.discover_client_host=0
 xdebug.client_host=host.docker.internal
+xdebug.client_port=9003
 xdebug.start_with_request=yes
 xdebug.profiler_enabled=1
 xdebug.output_dir=/tmp
@@ -20,6 +21,9 @@ xdebug.cli_color=1
 xdebug.show_error_trace=0
 xdebug.show_exception_trace=0
 xdebug.force_display_errors=1
+xdebug.max_nesting_level=250
+xdebug.var_display_max_data=10000
+xdebug.var_display_max_depth=20
 xdebug.log=/config/xdebug/xdebug.log
 xdebug.gc_stats_output_name=gcstats.%p.%u
 xdebug.profiler_output_name=cachegrind.out.%p.%u

diff --git a/8.0/helpers/xdebug/install.sh b/8.0/helpers/xdebug/install.sh
@@ -8,4 +8,4 @@
 pecl install -o -f xdebug-3.3.0
 docker-php-ext-enable xdebug
 rm -rf /tmp/pear
-cp /config/xdebug/xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+cp /config/xdebug/xdebug.ini "${PHP_INI_DIR}/conf.d/docker-php-ext-xdebug.ini"
diff --git a/8.1/Dockerfile b/8.1/Dockerfile
@@ -20,15 +20,11 @@ EXPOSE 8000/tcp
 EXPOSE 8080/tcp
 EXPOSE 8081/tcp
 
-# Alpine requirements
-COPY ./helpers/alpine/dependencies.sh /config/alpine/dependencies.sh
-RUN sh /config/alpine/dependencies.sh
-
 # Helper files
 COPY ./helpers/ /config/
 # Config and/or required files for PHP
-COPY ./config-files/opcache.ini /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
-COPY ./config-files/error_reporting.ini /usr/local/etc/php/conf.d/error_reporting.ini
+COPY ./config-files/opcache/opcache.ini "${PHP_INI_DIR}/conf.d/docker-php-ext-opcache.ini"
+COPY ./config-files/php/php.ini "${PHP_INI_DIR}/conf.d/app.ini"
 # Configuration files
 COPY ./config-files/ /config/
 

diff --git a/8.1/config-files/error_reporting.ini b/8.1/config-files/error_reporting.ini
diff --git a/8.1/config-files/opcache.ini → 8.1/config-files/opcache/opcache.ini b/8.1/config-files/opcache.ini → 8.1/config-files/opcache/opcache.ini
diff --git a/8.1/config-files/php/php.ini b/8.1/config-files/php/php.ini
@@ -0,0 +1,11 @@
+[PHP]
+expose_php = On
+display_errors = On
+error_reporting=E_ALL
+display_startup_errors = On
+max_execution_time = 0
+default_socket_timeout = -1
+post_max_size = 10M
+upload_max_filesize = 10M
+max_file_uploads = 20
+memory_limit = 1G
diff --git a/8.1/config-files/xdebug/xdebug.ini b/8.1/config-files/xdebug/xdebug.ini
@@ -10,8 +10,9 @@ zend_extension=xdebug.so
 
 [xdebug]
 xdebug.mode=develop,coverage,debug,gcstats,profile,trace
-xdebug.discover_client_host=1
+xdebug.discover_client_host=0
 xdebug.client_host=host.docker.internal
+xdebug.client_port=9003
 xdebug.start_with_request=yes
 xdebug.profiler_enabled=1
 xdebug.output_dir=/tmp
@@ -20,6 +21,9 @@ xdebug.cli_color=1
 xdebug.show_error_trace=0
 xdebug.show_exception_trace=0
 xdebug.force_display_errors=1
+xdebug.max_nesting_level=250
+xdebug.var_display_max_data=10000
+xdebug.var_display_max_depth=20
 xdebug.log=/config/xdebug/xdebug.log
 xdebug.gc_stats_output_name=gcstats.%p.%u
 xdebug.profiler_output_name=cachegrind.out.%p.%u

diff --git a/8.1/helpers/xdebug/install.sh b/8.1/helpers/xdebug/install.sh
@@ -8,4 +8,4 @@
 pecl install -o -f xdebug-3.3.0
 docker-php-ext-enable xdebug
 rm -rf /tmp/pear
-cp /config/xdebug/xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+cp /config/xdebug/xdebug.ini "${PHP_INI_DIR}/conf.d/docker-php-ext-xdebug.ini"
diff --git a/8.2/Dockerfile b/8.2/Dockerfile
@@ -23,8 +23,8 @@ EXPOSE 8081/tcp
 # Helper files
 COPY ./helpers/ /config/
 # Config and/or required files for PHP
-COPY ./config-files/opcache.ini /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
-COPY ./config-files/error_reporting.ini /usr/local/etc/php/conf.d/error_reporting.ini
+COPY ./config-files/opcache/opcache.ini "${PHP_INI_DIR}/conf.d/docker-php-ext-opcache.ini"
+COPY ./config-files/php/php.ini "${PHP_INI_DIR}/conf.d/app.ini"
 # Configuration files
 COPY ./config-files/ /config/
 

diff --git a/8.2/config-files/error_reporting.ini b/8.2/config-files/error_reporting.ini
diff --git a/8.2/config-files/opcache.ini → 8.2/config-files/opcache/opcache.ini b/8.2/config-files/opcache.ini → 8.2/config-files/opcache/opcache.ini
diff --git a/8.2/config-files/php/php.ini b/8.2/config-files/php/php.ini
@@ -0,0 +1,11 @@
+[PHP]
+expose_php = On
+display_errors = On
+error_reporting=E_ALL
+display_startup_errors = On
+max_execution_time = 0
+default_socket_timeout = -1
+post_max_size = 10M
+upload_max_filesize = 10M
+max_file_uploads = 20
+memory_limit = 1G
diff --git a/8.2/config-files/xdebug/xdebug.ini b/8.2/config-files/xdebug/xdebug.ini
@@ -10,8 +10,9 @@ zend_extension=xdebug.so
 
 [xdebug]
 xdebug.mode=develop,coverage,debug,gcstats,profile,trace
-xdebug.discover_client_host=1
+xdebug.discover_client_host=0
 xdebug.client_host=host.docker.internal
+xdebug.client_port=9003
 xdebug.start_with_request=yes
 xdebug.profiler_enabled=1
 xdebug.output_dir=/tmp
@@ -20,6 +21,9 @@ xdebug.cli_color=1
 xdebug.show_error_trace=0
 xdebug.show_exception_trace=0
 xdebug.force_display_errors=1
+xdebug.max_nesting_level=250
+xdebug.var_display_max_data=10000
+xdebug.var_display_max_depth=20
 xdebug.log=/config/xdebug/xdebug.log
 xdebug.gc_stats_output_name=gcstats.%p.%u
 xdebug.profiler_output_name=cachegrind.out.%p.%u

diff --git a/8.2/helpers/xdebug/install.sh b/8.2/helpers/xdebug/install.sh
@@ -8,4 +8,4 @@
 pecl install -o -f xdebug-3.3.0
 docker-php-ext-enable xdebug
 rm -rf /tmp/pear
-cp /config/xdebug/xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+cp /config/xdebug/xdebug.ini "${PHP_INI_DIR}/conf.d/docker-php-ext-xdebug.ini"
diff --git a/8.3/Dockerfile b/8.3/Dockerfile
@@ -23,8 +23,8 @@ EXPOSE 8081/tcp
 # Helper files
 COPY ./helpers/ /config/
 # Config and/or required files for PHP
-COPY ./config-files/opcache.ini /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
-COPY ./config-files/error_reporting.ini /usr/local/etc/php/conf.d/error_reporting.ini
+COPY ./config-files/opcache/opcache.ini "${PHP_INI_DIR}/conf.d/docker-php-ext-opcache.ini"
+COPY ./config-files/php/php.ini "${PHP_INI_DIR}/conf.d/app.ini"
 # Configuration files
 COPY ./config-files/ /config/
 

diff --git a/8.3/config-files/error_reporting.ini b/8.3/config-files/error_reporting.ini
diff --git a/8.3/config-files/opcache.ini → 8.3/config-files/opcache/opcache.ini b/8.3/config-files/opcache.ini → 8.3/config-files/opcache/opcache.ini
diff --git a/8.3/config-files/php/php.ini b/8.3/config-files/php/php.ini
@@ -0,0 +1,11 @@
+[PHP]
+expose_php = On
+display_errors = On
+error_reporting=E_ALL
+display_startup_errors = On
+max_execution_time = 0
+default_socket_timeout = -1
+post_max_size = 10M
+upload_max_filesize = 10M
+max_file_uploads = 20
+memory_limit = 1G
diff --git a/8.3/config-files/xdebug/xdebug.ini b/8.3/config-files/xdebug/xdebug.ini
@@ -10,8 +10,9 @@ zend_extension=xdebug.so
 
 [xdebug]
 xdebug.mode=develop,coverage,debug,gcstats,profile,trace
-xdebug.discover_client_host=1
+xdebug.discover_client_host=0
 xdebug.client_host=host.docker.internal
+xdebug.client_port=9003
 xdebug.start_with_request=yes
 xdebug.profiler_enabled=1
 xdebug.output_dir=/tmp
@@ -20,6 +21,9 @@ xdebug.cli_color=1
 xdebug.show_error_trace=0
 xdebug.show_exception_trace=0
 xdebug.force_display_errors=1
+xdebug.max_nesting_level=250
+xdebug.var_display_max_data=10000
+xdebug.var_display_max_depth=20
 xdebug.log=/config/xdebug/xdebug.log
 xdebug.gc_stats_output_name=gcstats.%p.%u
 xdebug.profiler_output_name=cachegrind.out.%p.%u

diff --git a/8.3/helpers/xdebug/install.sh b/8.3/helpers/xdebug/install.sh
@@ -8,4 +8,4 @@
 pecl install -o -f xdebug-3.3.0
 docker-php-ext-enable xdebug
 rm -rf /tmp/pear
-cp /config/xdebug/xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+cp /config/xdebug/xdebug.ini "${PHP_INI_DIR}/conf.d/docker-php-ext-xdebug.ini"