From aae29da228a2636ce6d4f6f568c0f6238f0965d8 Mon Sep 17 00:00:00 2001 From: Sam L Date: Sat, 31 Jan 2026 13:18:06 -0500 Subject: [PATCH 1/4] Initial commit, issue-21 --- bin/generate.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/generate.sh b/bin/generate.sh index da0cc18..7d787c3 100755 --- a/bin/generate.sh +++ b/bin/generate.sh @@ -15,6 +15,8 @@ php_docker_suffix=( "cli" "apache" "fpm" ) # PHP_VERSION => XDEBUG_VERSION declare -A xdebug_versions xdebug_versions=( + ["8.5"]="xdebug-3.3.1" + ["8.4"]="xdebug-3.3.1" ["8.3"]="xdebug-3.3.1" ["8.2"]="xdebug-3.3.1" ["8.1"]="xdebug-3.1.3" From 4d6cafd6c32f67c4d11beae64b119ba28b6272f5 Mon Sep 17 00:00:00 2001 From: Sam L Date: Sat, 31 Jan 2026 13:19:20 -0500 Subject: [PATCH 2/4] Update generation script and add generated files --- bin/generate.sh | 2 +- build/8.4-apache/Dockerfile | 19 +++++++++++++++++++ build/8.4-apache/xdebug.ini | 14 ++++++++++++++ build/8.4-cli/Dockerfile | 19 +++++++++++++++++++ build/8.4-cli/xdebug.ini | 14 ++++++++++++++ build/8.4-fpm/Dockerfile | 19 +++++++++++++++++++ build/8.4-fpm/xdebug.ini | 14 ++++++++++++++ build/8.5-apache/Dockerfile | 19 +++++++++++++++++++ build/8.5-apache/xdebug.ini | 14 ++++++++++++++ build/8.5-cli/Dockerfile | 19 +++++++++++++++++++ build/8.5-cli/xdebug.ini | 14 ++++++++++++++ build/8.5-fpm/Dockerfile | 19 +++++++++++++++++++ build/8.5-fpm/xdebug.ini | 14 ++++++++++++++ 13 files changed, 199 insertions(+), 1 deletion(-) create mode 100644 build/8.4-apache/Dockerfile create mode 100644 build/8.4-apache/xdebug.ini create mode 100644 build/8.4-cli/Dockerfile create mode 100644 build/8.4-cli/xdebug.ini create mode 100644 build/8.4-fpm/Dockerfile create mode 100644 build/8.4-fpm/xdebug.ini create mode 100644 build/8.5-apache/Dockerfile create mode 100644 build/8.5-apache/xdebug.ini create mode 100644 build/8.5-cli/Dockerfile create mode 100644 build/8.5-cli/xdebug.ini create mode 100644 build/8.5-fpm/Dockerfile create mode 100644 build/8.5-fpm/xdebug.ini diff --git a/bin/generate.sh b/bin/generate.sh index 7d787c3..d07d9c8 100755 --- a/bin/generate.sh +++ b/bin/generate.sh @@ -5,7 +5,7 @@ # # PHP Versions that will be generated -php_versions=( "8.3" "8.2" "8.1" ) +php_versions=( "8.5" "8.4" "8.3" "8.2" "8.1" ) # PHP variants that will be generated for each PHP version # final source image will be generated as follow: php:7.2-cli, php:7-2-apache and php:7.2-fpm diff --git a/build/8.4-apache/Dockerfile b/build/8.4-apache/Dockerfile new file mode 100644 index 0000000..265d76d --- /dev/null +++ b/build/8.4-apache/Dockerfile @@ -0,0 +1,19 @@ +FROM php:8.4-apache +LABEL org.opencontainers.image.authors="Przemek Szalko " + +# php intl extension +RUN apt-get update \ + && apt-get install -y libicu-dev \ + && docker-php-ext-install intl \ + && docker-php-ext-install pdo_mysql \ + && docker-php-source delete \ + && apt-get remove -y libicu-dev \ + && apt-get autoremove -y \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +RUN pecl channel-update pecl.php.net \ + && pecl install xdebug-3.3.1 \ + && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer + +COPY xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini diff --git a/build/8.4-apache/xdebug.ini b/build/8.4-apache/xdebug.ini new file mode 100644 index 0000000..b04f78c --- /dev/null +++ b/build/8.4-apache/xdebug.ini @@ -0,0 +1,14 @@ +[xdebug] +zend_extension=xdebug.so + +xdebug.cli_color=0 +xdebug.show_local_vars=1 +xdebug.start_with_request=trigger + +xdebug.output_dir="/tmp" +xdebug.profiler_output_name="cachegrind.out.%H.%t.%p" + +xdebug.mode=develop,debug +xdebug.discover_client_host=1 +xdebug.client_port=9000 + diff --git a/build/8.4-cli/Dockerfile b/build/8.4-cli/Dockerfile new file mode 100644 index 0000000..d9cbdfc --- /dev/null +++ b/build/8.4-cli/Dockerfile @@ -0,0 +1,19 @@ +FROM php:8.4-cli +LABEL org.opencontainers.image.authors="Przemek Szalko " + +# php intl extension +RUN apt-get update \ + && apt-get install -y libicu-dev \ + && docker-php-ext-install intl \ + && docker-php-ext-install pdo_mysql \ + && docker-php-source delete \ + && apt-get remove -y libicu-dev \ + && apt-get autoremove -y \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +RUN pecl channel-update pecl.php.net \ + && pecl install xdebug-3.3.1 \ + && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer + +COPY xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini diff --git a/build/8.4-cli/xdebug.ini b/build/8.4-cli/xdebug.ini new file mode 100644 index 0000000..b04f78c --- /dev/null +++ b/build/8.4-cli/xdebug.ini @@ -0,0 +1,14 @@ +[xdebug] +zend_extension=xdebug.so + +xdebug.cli_color=0 +xdebug.show_local_vars=1 +xdebug.start_with_request=trigger + +xdebug.output_dir="/tmp" +xdebug.profiler_output_name="cachegrind.out.%H.%t.%p" + +xdebug.mode=develop,debug +xdebug.discover_client_host=1 +xdebug.client_port=9000 + diff --git a/build/8.4-fpm/Dockerfile b/build/8.4-fpm/Dockerfile new file mode 100644 index 0000000..282e63a --- /dev/null +++ b/build/8.4-fpm/Dockerfile @@ -0,0 +1,19 @@ +FROM php:8.4-fpm +LABEL org.opencontainers.image.authors="Przemek Szalko " + +# php intl extension +RUN apt-get update \ + && apt-get install -y libicu-dev \ + && docker-php-ext-install intl \ + && docker-php-ext-install pdo_mysql \ + && docker-php-source delete \ + && apt-get remove -y libicu-dev \ + && apt-get autoremove -y \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +RUN pecl channel-update pecl.php.net \ + && pecl install xdebug-3.3.1 \ + && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer + +COPY xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini diff --git a/build/8.4-fpm/xdebug.ini b/build/8.4-fpm/xdebug.ini new file mode 100644 index 0000000..b04f78c --- /dev/null +++ b/build/8.4-fpm/xdebug.ini @@ -0,0 +1,14 @@ +[xdebug] +zend_extension=xdebug.so + +xdebug.cli_color=0 +xdebug.show_local_vars=1 +xdebug.start_with_request=trigger + +xdebug.output_dir="/tmp" +xdebug.profiler_output_name="cachegrind.out.%H.%t.%p" + +xdebug.mode=develop,debug +xdebug.discover_client_host=1 +xdebug.client_port=9000 + diff --git a/build/8.5-apache/Dockerfile b/build/8.5-apache/Dockerfile new file mode 100644 index 0000000..dd87358 --- /dev/null +++ b/build/8.5-apache/Dockerfile @@ -0,0 +1,19 @@ +FROM php:8.5-apache +LABEL org.opencontainers.image.authors="Przemek Szalko " + +# php intl extension +RUN apt-get update \ + && apt-get install -y libicu-dev \ + && docker-php-ext-install intl \ + && docker-php-ext-install pdo_mysql \ + && docker-php-source delete \ + && apt-get remove -y libicu-dev \ + && apt-get autoremove -y \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +RUN pecl channel-update pecl.php.net \ + && pecl install xdebug-3.3.1 \ + && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer + +COPY xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini diff --git a/build/8.5-apache/xdebug.ini b/build/8.5-apache/xdebug.ini new file mode 100644 index 0000000..b04f78c --- /dev/null +++ b/build/8.5-apache/xdebug.ini @@ -0,0 +1,14 @@ +[xdebug] +zend_extension=xdebug.so + +xdebug.cli_color=0 +xdebug.show_local_vars=1 +xdebug.start_with_request=trigger + +xdebug.output_dir="/tmp" +xdebug.profiler_output_name="cachegrind.out.%H.%t.%p" + +xdebug.mode=develop,debug +xdebug.discover_client_host=1 +xdebug.client_port=9000 + diff --git a/build/8.5-cli/Dockerfile b/build/8.5-cli/Dockerfile new file mode 100644 index 0000000..c5344a0 --- /dev/null +++ b/build/8.5-cli/Dockerfile @@ -0,0 +1,19 @@ +FROM php:8.5-cli +LABEL org.opencontainers.image.authors="Przemek Szalko " + +# php intl extension +RUN apt-get update \ + && apt-get install -y libicu-dev \ + && docker-php-ext-install intl \ + && docker-php-ext-install pdo_mysql \ + && docker-php-source delete \ + && apt-get remove -y libicu-dev \ + && apt-get autoremove -y \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +RUN pecl channel-update pecl.php.net \ + && pecl install xdebug-3.3.1 \ + && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer + +COPY xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini diff --git a/build/8.5-cli/xdebug.ini b/build/8.5-cli/xdebug.ini new file mode 100644 index 0000000..b04f78c --- /dev/null +++ b/build/8.5-cli/xdebug.ini @@ -0,0 +1,14 @@ +[xdebug] +zend_extension=xdebug.so + +xdebug.cli_color=0 +xdebug.show_local_vars=1 +xdebug.start_with_request=trigger + +xdebug.output_dir="/tmp" +xdebug.profiler_output_name="cachegrind.out.%H.%t.%p" + +xdebug.mode=develop,debug +xdebug.discover_client_host=1 +xdebug.client_port=9000 + diff --git a/build/8.5-fpm/Dockerfile b/build/8.5-fpm/Dockerfile new file mode 100644 index 0000000..eaad490 --- /dev/null +++ b/build/8.5-fpm/Dockerfile @@ -0,0 +1,19 @@ +FROM php:8.5-fpm +LABEL org.opencontainers.image.authors="Przemek Szalko " + +# php intl extension +RUN apt-get update \ + && apt-get install -y libicu-dev \ + && docker-php-ext-install intl \ + && docker-php-ext-install pdo_mysql \ + && docker-php-source delete \ + && apt-get remove -y libicu-dev \ + && apt-get autoremove -y \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + +RUN pecl channel-update pecl.php.net \ + && pecl install xdebug-3.3.1 \ + && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer + +COPY xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini diff --git a/build/8.5-fpm/xdebug.ini b/build/8.5-fpm/xdebug.ini new file mode 100644 index 0000000..b04f78c --- /dev/null +++ b/build/8.5-fpm/xdebug.ini @@ -0,0 +1,14 @@ +[xdebug] +zend_extension=xdebug.so + +xdebug.cli_color=0 +xdebug.show_local_vars=1 +xdebug.start_with_request=trigger + +xdebug.output_dir="/tmp" +xdebug.profiler_output_name="cachegrind.out.%H.%t.%p" + +xdebug.mode=develop,debug +xdebug.discover_client_host=1 +xdebug.client_port=9000 + From aab8cec774de22246abd0c55adb2b7a0bcfcb442 Mon Sep 17 00:00:00 2001 From: Sam L Date: Sat, 31 Jan 2026 13:27:31 -0500 Subject: [PATCH 3/4] Remove PHP 8.5 PHP 8.5 has no official docker image yet --- bin/generate.sh | 3 +-- build/8.5-apache/Dockerfile | 19 ------------------- build/8.5-apache/xdebug.ini | 14 -------------- build/8.5-cli/Dockerfile | 19 ------------------- build/8.5-cli/xdebug.ini | 14 -------------- build/8.5-fpm/Dockerfile | 19 ------------------- build/8.5-fpm/xdebug.ini | 14 -------------- 7 files changed, 1 insertion(+), 101 deletions(-) delete mode 100644 build/8.5-apache/Dockerfile delete mode 100644 build/8.5-apache/xdebug.ini delete mode 100644 build/8.5-cli/Dockerfile delete mode 100644 build/8.5-cli/xdebug.ini delete mode 100644 build/8.5-fpm/Dockerfile delete mode 100644 build/8.5-fpm/xdebug.ini diff --git a/bin/generate.sh b/bin/generate.sh index d07d9c8..9f40714 100755 --- a/bin/generate.sh +++ b/bin/generate.sh @@ -5,7 +5,7 @@ # # PHP Versions that will be generated -php_versions=( "8.5" "8.4" "8.3" "8.2" "8.1" ) +php_versions=( "8.4" "8.3" "8.2" "8.1" ) # PHP variants that will be generated for each PHP version # final source image will be generated as follow: php:7.2-cli, php:7-2-apache and php:7.2-fpm @@ -15,7 +15,6 @@ php_docker_suffix=( "cli" "apache" "fpm" ) # PHP_VERSION => XDEBUG_VERSION declare -A xdebug_versions xdebug_versions=( - ["8.5"]="xdebug-3.3.1" ["8.4"]="xdebug-3.3.1" ["8.3"]="xdebug-3.3.1" ["8.2"]="xdebug-3.3.1" diff --git a/build/8.5-apache/Dockerfile b/build/8.5-apache/Dockerfile deleted file mode 100644 index dd87358..0000000 --- a/build/8.5-apache/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -FROM php:8.5-apache -LABEL org.opencontainers.image.authors="Przemek Szalko " - -# php intl extension -RUN apt-get update \ - && apt-get install -y libicu-dev \ - && docker-php-ext-install intl \ - && docker-php-ext-install pdo_mysql \ - && docker-php-source delete \ - && apt-get remove -y libicu-dev \ - && apt-get autoremove -y \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - -RUN pecl channel-update pecl.php.net \ - && pecl install xdebug-3.3.1 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer - -COPY xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini diff --git a/build/8.5-apache/xdebug.ini b/build/8.5-apache/xdebug.ini deleted file mode 100644 index b04f78c..0000000 --- a/build/8.5-apache/xdebug.ini +++ /dev/null @@ -1,14 +0,0 @@ -[xdebug] -zend_extension=xdebug.so - -xdebug.cli_color=0 -xdebug.show_local_vars=1 -xdebug.start_with_request=trigger - -xdebug.output_dir="/tmp" -xdebug.profiler_output_name="cachegrind.out.%H.%t.%p" - -xdebug.mode=develop,debug -xdebug.discover_client_host=1 -xdebug.client_port=9000 - diff --git a/build/8.5-cli/Dockerfile b/build/8.5-cli/Dockerfile deleted file mode 100644 index c5344a0..0000000 --- a/build/8.5-cli/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -FROM php:8.5-cli -LABEL org.opencontainers.image.authors="Przemek Szalko " - -# php intl extension -RUN apt-get update \ - && apt-get install -y libicu-dev \ - && docker-php-ext-install intl \ - && docker-php-ext-install pdo_mysql \ - && docker-php-source delete \ - && apt-get remove -y libicu-dev \ - && apt-get autoremove -y \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - -RUN pecl channel-update pecl.php.net \ - && pecl install xdebug-3.3.1 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer - -COPY xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini diff --git a/build/8.5-cli/xdebug.ini b/build/8.5-cli/xdebug.ini deleted file mode 100644 index b04f78c..0000000 --- a/build/8.5-cli/xdebug.ini +++ /dev/null @@ -1,14 +0,0 @@ -[xdebug] -zend_extension=xdebug.so - -xdebug.cli_color=0 -xdebug.show_local_vars=1 -xdebug.start_with_request=trigger - -xdebug.output_dir="/tmp" -xdebug.profiler_output_name="cachegrind.out.%H.%t.%p" - -xdebug.mode=develop,debug -xdebug.discover_client_host=1 -xdebug.client_port=9000 - diff --git a/build/8.5-fpm/Dockerfile b/build/8.5-fpm/Dockerfile deleted file mode 100644 index eaad490..0000000 --- a/build/8.5-fpm/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -FROM php:8.5-fpm -LABEL org.opencontainers.image.authors="Przemek Szalko " - -# php intl extension -RUN apt-get update \ - && apt-get install -y libicu-dev \ - && docker-php-ext-install intl \ - && docker-php-ext-install pdo_mysql \ - && docker-php-source delete \ - && apt-get remove -y libicu-dev \ - && apt-get autoremove -y \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - -RUN pecl channel-update pecl.php.net \ - && pecl install xdebug-3.3.1 \ - && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer - -COPY xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini diff --git a/build/8.5-fpm/xdebug.ini b/build/8.5-fpm/xdebug.ini deleted file mode 100644 index b04f78c..0000000 --- a/build/8.5-fpm/xdebug.ini +++ /dev/null @@ -1,14 +0,0 @@ -[xdebug] -zend_extension=xdebug.so - -xdebug.cli_color=0 -xdebug.show_local_vars=1 -xdebug.start_with_request=trigger - -xdebug.output_dir="/tmp" -xdebug.profiler_output_name="cachegrind.out.%H.%t.%p" - -xdebug.mode=develop,debug -xdebug.discover_client_host=1 -xdebug.client_port=9000 - From 84db78c2c732e9fb4f3f7afb842929ba78bd0af9 Mon Sep 17 00:00:00 2001 From: Sam L Date: Sat, 31 Jan 2026 13:37:23 -0500 Subject: [PATCH 4/4] Use xdebug-3.4.5 for PHP 8.4 --- bin/generate.sh | 2 +- build/8.4-apache/Dockerfile | 2 +- build/8.4-cli/Dockerfile | 2 +- build/8.4-fpm/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/generate.sh b/bin/generate.sh index 9f40714..a8fa2f0 100755 --- a/bin/generate.sh +++ b/bin/generate.sh @@ -15,7 +15,7 @@ php_docker_suffix=( "cli" "apache" "fpm" ) # PHP_VERSION => XDEBUG_VERSION declare -A xdebug_versions xdebug_versions=( - ["8.4"]="xdebug-3.3.1" + ["8.4"]="xdebug-3.4.5" ["8.3"]="xdebug-3.3.1" ["8.2"]="xdebug-3.3.1" ["8.1"]="xdebug-3.1.3" diff --git a/build/8.4-apache/Dockerfile b/build/8.4-apache/Dockerfile index 265d76d..a0b7267 100644 --- a/build/8.4-apache/Dockerfile +++ b/build/8.4-apache/Dockerfile @@ -13,7 +13,7 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* RUN pecl channel-update pecl.php.net \ - && pecl install xdebug-3.3.1 \ + && pecl install xdebug-3.4.5 \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer COPY xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini diff --git a/build/8.4-cli/Dockerfile b/build/8.4-cli/Dockerfile index d9cbdfc..921b18b 100644 --- a/build/8.4-cli/Dockerfile +++ b/build/8.4-cli/Dockerfile @@ -13,7 +13,7 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* RUN pecl channel-update pecl.php.net \ - && pecl install xdebug-3.3.1 \ + && pecl install xdebug-3.4.5 \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer COPY xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini diff --git a/build/8.4-fpm/Dockerfile b/build/8.4-fpm/Dockerfile index 282e63a..04b0cd8 100644 --- a/build/8.4-fpm/Dockerfile +++ b/build/8.4-fpm/Dockerfile @@ -13,7 +13,7 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* RUN pecl channel-update pecl.php.net \ - && pecl install xdebug-3.3.1 \ + && pecl install xdebug-3.4.5 \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer COPY xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini