[FIX] xdebug version for php 7.0

tylerkahn · Jan 25, 2020 · 98dbe3c · 98dbe3c
1 parent ae97176
commit 98dbe3c
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 3 deletions.
diff --git a/docker/php-apache-dev/5.6/Dockerfile b/docker/php-apache-dev/5.6/Dockerfile
@@ -23,6 +23,7 @@ RUN set -x \
         blackfire-php \
         blackfire-agent \
     && pecl install xdebug-2.5.5 \
+
     && echo "zend_extension=xdebug.so" > /usr/local/etc/php/conf.d/xdebug.ini \
     # Enable php development services
     && docker-service enable syslog \

diff --git a/docker/php-apache-dev/7.0/Dockerfile b/docker/php-apache-dev/7.0/Dockerfile
@@ -22,7 +22,7 @@ RUN set -x \
     && apt-install \
         blackfire-php \
         blackfire-agent \
-    && pecl install xdebug \
+    && pecl install xdebug-2.8.1 \
     && echo "zend_extension=xdebug.so" > /usr/local/etc/php/conf.d/xdebug.ini \
     # Enable php development services
     && docker-service enable syslog \

diff --git a/docker/php-dev/5.6/Dockerfile b/docker/php-dev/5.6/Dockerfile
@@ -15,6 +15,7 @@ RUN set -x \
         blackfire-php \
         blackfire-agent \
     && pecl install xdebug-2.5.5 \
+
     && echo "zend_extension=xdebug.so" > /usr/local/etc/php/conf.d/xdebug.ini \
     # Enable php development services
     && docker-service enable syslog \

diff --git a/docker/php-dev/7.0/Dockerfile b/docker/php-dev/7.0/Dockerfile
@@ -14,7 +14,7 @@ RUN set -x \
     && apt-install \
         blackfire-php \
         blackfire-agent \
-    && pecl install xdebug \
+    && pecl install xdebug-2.8.1 \
     && echo "zend_extension=xdebug.so" > /usr/local/etc/php/conf.d/xdebug.ini \
     # Enable php development services
     && docker-service enable syslog \

diff --git a/docker/php-nginx-dev/5.6/Dockerfile b/docker/php-nginx-dev/5.6/Dockerfile
@@ -23,6 +23,7 @@ RUN set -x \
         blackfire-php \
         blackfire-agent \
     && pecl install xdebug-2.5.5 \
+
     && echo "zend_extension=xdebug.so" > /usr/local/etc/php/conf.d/xdebug.ini \
     # Enable php development services
     && docker-service enable syslog \

diff --git a/docker/php-nginx-dev/7.0/Dockerfile b/docker/php-nginx-dev/7.0/Dockerfile
@@ -22,7 +22,7 @@ RUN set -x \
     && apt-install \
         blackfire-php \
         blackfire-agent \
-    && pecl install xdebug \
+    && pecl install xdebug-2.8.1 \
     && echo "zend_extension=xdebug.so" > /usr/local/etc/php/conf.d/xdebug.ini \
     # Enable php development services
     && docker-service enable syslog \

diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2
@@ -169,6 +169,8 @@
         blackfire-agent \
 {%- if version|int == 5 %}
     && pecl install xdebug-2.5.5 \
+{% elif version == '7.0' %}
+    && pecl install xdebug-2.8.1 \
 {%- else %}
     && pecl install xdebug \
 {%- endif %}