Fix xdebug incompatibility with php 7.4

theCapypara · Feb 19, 2024 · cf8490f · cf8490f
1 parent f6fe9f0
commit cf8490f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/node-php/7.4/buster/apache/Dockerfile b/node-php/7.4/buster/apache/Dockerfile
@@ -28,7 +28,7 @@ RUN requirements="nodejs npm msmtp libmcrypt-dev libwebp-dev libmcrypt4 libcurl3
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # Install xdebug (based on https://gist.github.com/chadrien/c90927ec2d160ffea9c4)
-RUN yes | pecl install xdebug
+RUN yes | pecl install xdebug-3.1.6
 
 # Install yaml
 RUN yes | pecl install yaml && echo "extension=yaml.so" > /usr/local/etc/php/conf.d/ext-yaml.ini

diff --git a/node-php/7.4/buster/cli-composer/Dockerfile b/node-php/7.4/buster/cli-composer/Dockerfile
@@ -28,7 +28,7 @@ RUN requirements="nodejs npm msmtp libmcrypt-dev libwebp-dev libmcrypt4 libcurl3
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # Install xdebug (based on https://gist.github.com/chadrien/c90927ec2d160ffea9c4)
-RUN yes | pecl install xdebug
+RUN yes | pecl install xdebug-3.1.6
 
 # Install yaml
 RUN yes | pecl install yaml && echo "extension=yaml.so" > /usr/local/etc/php/conf.d/ext-yaml.ini

diff --git a/node-php/7.4/buster/cli-composer2/Dockerfile b/node-php/7.4/buster/cli-composer2/Dockerfile
@@ -28,7 +28,7 @@ RUN requirements="nodejs npm msmtp libmcrypt-dev libwebp-dev libmcrypt4 libcurl3
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # Install xdebug (based on https://gist.github.com/chadrien/c90927ec2d160ffea9c4)
-RUN yes | pecl install xdebug
+RUN yes | pecl install xdebug-3.1.6
 
 # Install yaml
 RUN yes | pecl install yaml && echo "extension=yaml.so" > /usr/local/etc/php/conf.d/ext-yaml.ini

diff --git a/node-php/7.4/buster/fpm/Dockerfile b/node-php/7.4/buster/fpm/Dockerfile
@@ -28,7 +28,7 @@ RUN requirements="nodejs npm msmtp libmcrypt-dev libwebp-dev libmcrypt4 libcurl3
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # Install xdebug (based on https://gist.github.com/chadrien/c90927ec2d160ffea9c4)
-RUN yes | pecl install xdebug
+RUN yes | pecl install xdebug-3.1.6
 
 # Install yaml
 RUN yes | pecl install yaml && echo "extension=yaml.so" > /usr/local/etc/php/conf.d/ext-yaml.ini

diff --git a/node-php/builder/build.sh b/node-php/builder/build.sh
@@ -38,6 +38,12 @@ for goal in */*/*; do
     fi
     sed -e "s/\@@gd_requirements@@/$GD_OPTIONS/" -i "$version/$base/$variant/Dockerfile"
 
+    # If php 7.4: Install xdebug 3.1.6
+    if [[ "7.4" == "$version" ]]
+    then
+        sed -e "s/pecl install xdebug/pecl install xdebug-3.1.6/" -i "$version/$base/$variant/Dockerfile"
+    fi
+
     # If apache: Copy Vhost and add it
     if [[ "apache" == "$variant" ]]
     then