Xdebug should be disabled by default

lando · Dec 14, 2024 · 34f716c · 34f716c
1 parent 13720db
commit 34f716c
Show file tree

Hide file tree

Showing 14 changed files with 55 additions and 21 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -4,7 +4,6 @@ on:
   release:
     types:
       - published
-      - edited
 
 jobs:
   deploy:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,14 +1,9 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
-## v1.6.2 - [December 6, 2024](https://github.com/lando/php/releases/tag/v1.6.2)
-
-## v1.6.2 - [December 6, 2024](https://github.com/lando/php/releases/tag/v1.6.2)
-
-* Updated 8.4RC image to 8.4 stable.
+* Fixed issue causing `xdebug` extension to not be disabled by default in PHP 8.3 and 8.4 images.
+* Added `install-php-extensions` script to PHP 7.4-8.2 images.
 * Added MariaDB client tools to PHP 7.4-8.4 images [#120](https://github.com/lando/php/issues/120).
-* Added `xdebug` and `imagick` extension to PHP 8.4 images.
 * Added `xhprof` extension to PHP 7.4-8.4 images.
-* Added `imagick` extension to PHP 8.3 images.
 * Updated `sqlite3` to 3.45.1 in PHP 8.3-8.4 images.
 
 ## v1.6.3 - [December 7, 2024](https://github.com/lando/php/releases/tag/v1.6.3)
@@ -17,8 +12,12 @@
 
 ## v1.6.2 - [December 6, 2024](https://github.com/lando/php/releases/tag/v1.6.2)
 
+* Updated PHP 8.1-8.3 base images to Debian 12 (bookworm).
+* Added `install-php-extensions` script to PHP 8.3 and 8.4 images.
+* Added `imagick` extension to PHP 8.3 and 8.4 images.
+* Updated 8.4RC image to 8.4 stable.
+* Added `xdebug` extension to PHP 8.4 images.
 * Updated the version index.md to get Docuverse page to build correctly.
-
 * Updated to [@lando/vitepress-theme-default-plus@v1.1.0-beta.24](https://github.com/lando/vitepress-theme-default-plus/releases/tag/v1.1.0-beta.24).
 * Updated GitHub Actions to build images only on changes to images or workflows.
 

diff --git a/images/7.4-apache/Dockerfile b/images/7.4-apache/Dockerfile
@@ -52,10 +52,13 @@ RUN \
   && install-php-extensions pdo_pgsql \
   && install-php-extensions redis \
   && install-php-extensions soap \
-  && install-php-extensions xdebug \
   && install-php-extensions xhprof \
   && install-php-extensions zip
 
+# Install xdebug but disable it by default
+RUN install-php-extensions xdebug \
+  && rm -f /usr/local/etc/php/conf.d/*xdebug.ini
+
 RUN install-php-extensions @composer-2.2.12
 
 RUN \

diff --git a/images/7.4-fpm/Dockerfile b/images/7.4-fpm/Dockerfile
@@ -52,10 +52,13 @@ RUN \
   && install-php-extensions pdo_pgsql \
   && install-php-extensions redis \
   && install-php-extensions soap \
-  && install-php-extensions xdebug \
   && install-php-extensions xhprof \
   && install-php-extensions zip
 
+# Install xdebug but disable it by default
+RUN install-php-extensions xdebug \
+  && rm -f /usr/local/etc/php/conf.d/*xdebug.ini
+
 RUN install-php-extensions @composer-2.2.12
 
 RUN \

diff --git a/images/8.0-apache/Dockerfile b/images/8.0-apache/Dockerfile
@@ -52,10 +52,13 @@ RUN \
   && install-php-extensions pdo_pgsql \
   && install-php-extensions redis \
   && install-php-extensions soap \
-  && install-php-extensions xdebug \
   && install-php-extensions xhprof \
   && install-php-extensions zip
 
+# Install xdebug but disable it by default
+RUN install-php-extensions xdebug \
+  && rm -f /usr/local/etc/php/conf.d/*xdebug.ini
+
 RUN install-php-extensions @composer-2
 
 RUN \

diff --git a/images/8.0-fpm/Dockerfile b/images/8.0-fpm/Dockerfile
@@ -52,10 +52,13 @@ RUN \
   && install-php-extensions pdo_pgsql \
   && install-php-extensions redis \
   && install-php-extensions soap \
-  && install-php-extensions xdebug \
   && install-php-extensions xhprof \
   && install-php-extensions zip
 
+# Install xdebug but disable it by default
+RUN install-php-extensions xdebug \
+  && rm -f /usr/local/etc/php/conf.d/*xdebug.ini
+
 RUN install-php-extensions @composer-2
 
 RUN \

diff --git a/images/8.1-apache/Dockerfile b/images/8.1-apache/Dockerfile
@@ -50,10 +50,13 @@ RUN \
   && install-php-extensions pdo_pgsql \
   && install-php-extensions redis \
   && install-php-extensions soap \
-  && install-php-extensions xdebug \
   && install-php-extensions xhprof \
   && install-php-extensions zip
 
+# Install xdebug but disable it by default
+RUN install-php-extensions xdebug \
+  && rm -f /usr/local/etc/php/conf.d/*xdebug.ini
+
 RUN install-php-extensions @composer-2
 
 RUN \

diff --git a/images/8.1-fpm/Dockerfile b/images/8.1-fpm/Dockerfile
@@ -50,10 +50,13 @@ RUN \
   && install-php-extensions pdo_pgsql \
   && install-php-extensions redis \
   && install-php-extensions soap \
-  && install-php-extensions xdebug \
   && install-php-extensions xhprof \
   && install-php-extensions zip
 
+# Install xdebug but disable it by default
+RUN install-php-extensions xdebug \
+  && rm -f /usr/local/etc/php/conf.d/*xdebug.ini
+
 RUN install-php-extensions @composer-2
 
 RUN \

diff --git a/images/8.2-apache/Dockerfile b/images/8.2-apache/Dockerfile
@@ -50,10 +50,13 @@ RUN \
   && install-php-extensions pdo_pgsql \
   && install-php-extensions redis \
   && install-php-extensions soap \
-  && install-php-extensions xdebug \
   && install-php-extensions xhprof \
   && install-php-extensions zip
 
+# Install xdebug but disable it by default
+RUN install-php-extensions xdebug \
+  && rm -f /usr/local/etc/php/conf.d/*xdebug.ini
+
 RUN install-php-extensions @composer-2
 
 RUN \

diff --git a/images/8.2-fpm/Dockerfile b/images/8.2-fpm/Dockerfile
@@ -50,10 +50,13 @@ RUN \
   && install-php-extensions pdo_pgsql \
   && install-php-extensions redis \
   && install-php-extensions soap \
-  && install-php-extensions xdebug \
   && install-php-extensions xhprof \
   && install-php-extensions zip
 
+# Install xdebug but disable it by default
+RUN install-php-extensions xdebug \
+  && rm -f /usr/local/etc/php/conf.d/*xdebug.ini
+
 RUN install-php-extensions @composer-2
 
 RUN \

diff --git a/images/8.3-apache/Dockerfile b/images/8.3-apache/Dockerfile
@@ -51,10 +51,13 @@ RUN \
   && install-php-extensions pdo_pgsql \
   && install-php-extensions redis \
   && install-php-extensions soap \
-  && install-php-extensions xdebug \
   && install-php-extensions xhprof \
   && install-php-extensions zip
 
+# Install xdebug but disable it by default
+RUN install-php-extensions xdebug \
+  && rm -f /usr/local/etc/php/conf.d/*xdebug.ini
+
 RUN install-php-extensions @composer-2
 
 # Drupal 11 requires sqlite3 3.45+

diff --git a/images/8.3-fpm/Dockerfile b/images/8.3-fpm/Dockerfile
@@ -52,10 +52,13 @@ RUN \
   && install-php-extensions pdo_pgsql \
   && install-php-extensions redis \
   && install-php-extensions soap \
-  && install-php-extensions xdebug \
   && install-php-extensions xhprof \
   && install-php-extensions zip
 
+# Install xdebug but disable it by default
+RUN install-php-extensions xdebug \
+  && rm -f /usr/local/etc/php/conf.d/*xdebug.ini
+
 RUN install-php-extensions @composer-2
 
 # Drupal 11 requires sqlite3 3.45+

diff --git a/images/8.4-apache/Dockerfile b/images/8.4-apache/Dockerfile
@@ -53,10 +53,13 @@ RUN \
   && install-php-extensions pdo_pgsql \
   && install-php-extensions redis \
   && install-php-extensions soap \
-  && install-php-extensions xdebug \
   && install-php-extensions xhprof \
   && install-php-extensions zip
 
+# Install xdebug but disable it by default
+RUN install-php-extensions xdebug \
+  && rm -f /usr/local/etc/php/conf.d/*xdebug.ini
+
 RUN install-php-extensions @composer-2
 
 # Drupal 11 requires sqlite3 3.45+

diff --git a/images/8.4-fpm/Dockerfile b/images/8.4-fpm/Dockerfile
@@ -54,10 +54,13 @@ RUN \
   && install-php-extensions pdo_pgsql \
   && install-php-extensions redis \
   && install-php-extensions soap \
-  && install-php-extensions xdebug \
   && install-php-extensions xhprof \
   && install-php-extensions zip
 
+# Install xdebug but disable it by default
+RUN install-php-extensions xdebug \
+  && rm -f /usr/local/etc/php/conf.d/*xdebug.ini
+
 RUN install-php-extensions @composer-2
 
 # Drupal 11 requires sqlite3 3.45+
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,6 @@ on: @@
       release:
         types:
           - published
-          - edited
     jobs:
       deploy:
@@ Expand Down @@