blackfire is not yet available for 7.3

webdevops · Nov 2, 2018 · 78a4e95 · 78a4e95
1 parent a166e17
commit 78a4e95
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 15 deletions.
diff --git a/docker/php-apache-dev/7.3/Dockerfile b/docker/php-apache-dev/7.3/Dockerfile
@@ -17,11 +17,6 @@ COPY conf/ /opt/docker/
 
 RUN set -x \
     # Install development environment
-    && wget -O - https://packagecloud.io/gpg.key | apt-key add - \
-    && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \
-    && apt-install \
-        blackfire-php \
-        blackfire-agent \
     && pecl install xdebug \
     && echo "zend_extension=xdebug.so" > /usr/local/etc/php/conf.d/xdebug.ini \
     # Enable php development services

diff --git a/docker/php-dev/7.3/Dockerfile b/docker/php-dev/7.3/Dockerfile
@@ -9,11 +9,6 @@ COPY conf/ /opt/docker/
 
 RUN set -x \
     # Install development environment
-    && wget -O - https://packagecloud.io/gpg.key | apt-key add - \
-    && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \
-    && apt-install \
-        blackfire-php \
-        blackfire-agent \
     && pecl install xdebug \
     && echo "zend_extension=xdebug.so" > /usr/local/etc/php/conf.d/xdebug.ini \
     # Enable php development services

diff --git a/docker/php-nginx-dev/7.3/Dockerfile b/docker/php-nginx-dev/7.3/Dockerfile
@@ -17,11 +17,6 @@ COPY conf/ /opt/docker/
 
 RUN set -x \
     # Install development environment
-    && wget -O - https://packagecloud.io/gpg.key | apt-key add - \
-    && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \
-    && apt-install \
-        blackfire-php \
-        blackfire-agent \
     && pecl install xdebug \
     && echo "zend_extension=xdebug.so" > /usr/local/etc/php/conf.d/xdebug.ini \
     # Enable php development services

diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2
@@ -110,11 +110,13 @@
 
 {% macro officialDevelopment(role='', version='') -%}
     # Install development environment
+{%- if version != '7.3' %}
     && wget -O - https://packagecloud.io/gpg.key | apt-key add - \
     && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \
     && apt-install \
         blackfire-php \
         blackfire-agent \
+{%- endif %}
 {%- if version|int == 5 %}
     && pecl install xdebug-2.5.5 \
 {%- else %}