fix blackfire not available for php8

Author: Hans Höchtl

docker/php-apache-dev/5.6/Dockerfile

@@ -16,6 +16,7 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
 COPY conf/ /opt/docker/
 
 RUN set -x \
+    
     # Install development environment
     && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \
     && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \

docker/php-apache-dev/7.0/Dockerfile

@@ -16,6 +16,7 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
 COPY conf/ /opt/docker/
 
 RUN set -x \
+    
     # Install development environment
     && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \
     && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \

docker/php-apache-dev/7.1-alpine/Dockerfile

@@ -16,6 +16,7 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
 COPY conf/ /opt/docker/
 
 RUN set -x \
+    
     # Install development environment
     && wget -q -O blackfire-agent https://packages.blackfire.io/binaries/blackfire-agent/1.34.0/blackfire-agent-linux_static_amd64 \
     && mv blackfire-agent /usr/local/bin/ \

docker/php-apache-dev/7.1/Dockerfile

@@ -16,6 +16,7 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
 COPY conf/ /opt/docker/
 
 RUN set -x \
+    
     # Install development environment
     && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \
     && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \

docker/php-apache-dev/7.2-alpine/Dockerfile

@@ -16,6 +16,7 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
 COPY conf/ /opt/docker/
 
 RUN set -x \
+    
     # Install development environment
     && wget -q -O blackfire-agent https://packages.blackfire.io/binaries/blackfire-agent/1.34.0/blackfire-agent-linux_static_amd64 \
     && mv blackfire-agent /usr/local/bin/ \

docker/php-apache-dev/7.2/Dockerfile

@@ -16,6 +16,7 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
 COPY conf/ /opt/docker/
 
 RUN set -x \
+    
     # Install development environment
     && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \
     && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \

docker/php-apache-dev/7.3-alpine/Dockerfile

@@ -16,6 +16,7 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
 COPY conf/ /opt/docker/
 
 RUN set -x \
+    
     # Install development environment
     && wget -q -O blackfire-agent https://packages.blackfire.io/binaries/blackfire-agent/1.34.0/blackfire-agent-linux_static_amd64 \
     && mv blackfire-agent /usr/local/bin/ \

docker/php-apache-dev/7.3/Dockerfile

@@ -16,6 +16,7 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
 COPY conf/ /opt/docker/
 
 RUN set -x \
+    
     # Install development environment
     && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \
     && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \

docker/php-apache-dev/7.4-alpine/Dockerfile

@@ -16,6 +16,7 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
 COPY conf/ /opt/docker/
 
 RUN set -x \
+    
     # Install development environment
     && wget -q -O blackfire-agent https://packages.blackfire.io/binaries/blackfire-agent/1.34.0/blackfire-agent-linux_static_amd64 \
     && mv blackfire-agent /usr/local/bin/ \

docker/php-apache-dev/7.4/Dockerfile

@@ -16,6 +16,7 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
 COPY conf/ /opt/docker/
 
 RUN set -x \
+    
     # Install development environment
     && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \
     && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \

docker/php-apache-dev/8.0-alpine/Dockerfile

@@ -16,13 +16,7 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
 COPY conf/ /opt/docker/
 
 RUN set -x \
-    # Install development environment
-    && wget -q -O blackfire-agent https://packages.blackfire.io/binaries/blackfire-agent/1.34.0/blackfire-agent-linux_static_amd64 \
-    && mv blackfire-agent /usr/local/bin/ \
-    && chmod +x /usr/local/bin/blackfire-agent \
-    && wget -q -O blackfire.so https://packages.blackfire.io/binaries/blackfire-php/1.33.0/blackfire-php-alpine_amd64-php-80.so \
-    && mv blackfire.so "$(php -r "echo ini_get('extension_dir');")/blackfire.so" \
-    && mkdir /var/run/blackfire/ \
+    
     && apk-install \
         make \
         autoconf \

docker/php-apache-dev/8.0/Dockerfile

@@ -16,12 +16,7 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
 COPY conf/ /opt/docker/
 
 RUN set -x \
-    # Install development environment
-    && wget -q -O - https://packages.blackfire.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 \
+    
     && pickle install xdebug \
     && docker-php-ext-enable xdebug \
     # Enable php development services

docker/php-dev/5.6/Dockerfile

@@ -8,6 +8,7 @@ FROM webdevops/php:5.6
 COPY conf/ /opt/docker/
 
 RUN set -x \
+    
     # Install development environment
     && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \
     && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \

docker/php-dev/7.0/Dockerfile

@@ -8,6 +8,7 @@ FROM webdevops/php:7.0
 COPY conf/ /opt/docker/
 
 RUN set -x \
+    
     # Install development environment
     && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \
     && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \

docker/php-dev/7.1-alpine/Dockerfile

@@ -8,6 +8,7 @@ FROM webdevops/php:7.1-alpine
 COPY conf/ /opt/docker/
 
 RUN set -x \
+    
     # Install development environment
     && wget -q -O blackfire-agent https://packages.blackfire.io/binaries/blackfire-agent/1.34.0/blackfire-agent-linux_static_amd64 \
     && mv blackfire-agent /usr/local/bin/ \

docker/php-dev/7.1/Dockerfile

@@ -8,6 +8,7 @@ FROM webdevops/php:7.1
 COPY conf/ /opt/docker/
 
 RUN set -x \
+    
     # Install development environment
     && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \
     && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \

docker/php-dev/7.2-alpine/Dockerfile

@@ -8,6 +8,7 @@ FROM webdevops/php:7.2-alpine
 COPY conf/ /opt/docker/
 
 RUN set -x \
+    
     # Install development environment
     && wget -q -O blackfire-agent https://packages.blackfire.io/binaries/blackfire-agent/1.34.0/blackfire-agent-linux_static_amd64 \
     && mv blackfire-agent /usr/local/bin/ \

docker/php-dev/7.2/Dockerfile

@@ -8,6 +8,7 @@ FROM webdevops/php:7.2
 COPY conf/ /opt/docker/
 
 RUN set -x \
+    
     # Install development environment
     && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \
     && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \

docker/php-dev/7.3-alpine/Dockerfile

@@ -8,6 +8,7 @@ FROM webdevops/php:7.3-alpine
 COPY conf/ /opt/docker/
 
 RUN set -x \
+    
     # Install development environment
     && wget -q -O blackfire-agent https://packages.blackfire.io/binaries/blackfire-agent/1.34.0/blackfire-agent-linux_static_amd64 \
     && mv blackfire-agent /usr/local/bin/ \

docker/php-dev/7.3/Dockerfile

@@ -8,6 +8,7 @@ FROM webdevops/php:7.3
 COPY conf/ /opt/docker/
 
 RUN set -x \
+    
     # Install development environment
     && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \
     && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \

docker/php-dev/7.4-alpine/Dockerfile

@@ -8,6 +8,7 @@ FROM webdevops/php:7.4-alpine
 COPY conf/ /opt/docker/
 
 RUN set -x \
+    
     # Install development environment
     && wget -q -O blackfire-agent https://packages.blackfire.io/binaries/blackfire-agent/1.34.0/blackfire-agent-linux_static_amd64 \
     && mv blackfire-agent /usr/local/bin/ \

docker/php-dev/7.4/Dockerfile

@@ -8,6 +8,7 @@ FROM webdevops/php:7.4
 COPY conf/ /opt/docker/
 
 RUN set -x \
+    
     # Install development environment
     && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \
     && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \

docker/php-dev/8.0-alpine/Dockerfile

@@ -8,13 +8,7 @@ FROM webdevops/php:8.0-alpine
 COPY conf/ /opt/docker/
 
 RUN set -x \
-    # Install development environment
-    && wget -q -O blackfire-agent https://packages.blackfire.io/binaries/blackfire-agent/1.34.0/blackfire-agent-linux_static_amd64 \
-    && mv blackfire-agent /usr/local/bin/ \
-    && chmod +x /usr/local/bin/blackfire-agent \
-    && wget -q -O blackfire.so https://packages.blackfire.io/binaries/blackfire-php/1.33.0/blackfire-php-alpine_amd64-php-80.so \
-    && mv blackfire.so "$(php -r "echo ini_get('extension_dir');")/blackfire.so" \
-    && mkdir /var/run/blackfire/ \
+    
     && apk-install \
         make \
         autoconf \

docker/php-dev/8.0/Dockerfile

@@ -8,12 +8,7 @@ FROM webdevops/php:8.0
 COPY conf/ /opt/docker/
 
 RUN set -x \
-    # Install development environment
-    && wget -q -O - https://packages.blackfire.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 \
+    
     && pickle install xdebug \
     && docker-php-ext-enable xdebug \
     # Enable php development services

docker/php-nginx-dev/5.6/Dockerfile

@@ -16,6 +16,7 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
 COPY conf/ /opt/docker/
 
 RUN set -x \
+    
     # Install development environment
     && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \
     && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \

docker/php-nginx-dev/7.0/Dockerfile

@@ -16,6 +16,7 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
 COPY conf/ /opt/docker/
 
 RUN set -x \
+    
     # Install development environment
     && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \
     && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \

docker/php-nginx-dev/7.1-alpine/Dockerfile

@@ -16,6 +16,7 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
 COPY conf/ /opt/docker/
 
 RUN set -x \
+    
     # Install development environment
     && wget -q -O blackfire-agent https://packages.blackfire.io/binaries/blackfire-agent/1.34.0/blackfire-agent-linux_static_amd64 \
     && mv blackfire-agent /usr/local/bin/ \

docker/php-nginx-dev/7.1/Dockerfile

@@ -16,6 +16,7 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
 COPY conf/ /opt/docker/
 
 RUN set -x \
+    
     # Install development environment
     && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \
     && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \

docker/php-nginx-dev/7.2-alpine/Dockerfile

@@ -16,6 +16,7 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
 COPY conf/ /opt/docker/
 
 RUN set -x \
+    
     # Install development environment
     && wget -q -O blackfire-agent https://packages.blackfire.io/binaries/blackfire-agent/1.34.0/blackfire-agent-linux_static_amd64 \
     && mv blackfire-agent /usr/local/bin/ \

docker/php-nginx-dev/7.2/Dockerfile

@@ -16,6 +16,7 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
 COPY conf/ /opt/docker/
 
 RUN set -x \
+    
     # Install development environment
     && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \
     && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \

docker/php-nginx-dev/7.3-alpine/Dockerfile

@@ -16,6 +16,7 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
 COPY conf/ /opt/docker/
 
 RUN set -x \
+    
     # Install development environment
     && wget -q -O blackfire-agent https://packages.blackfire.io/binaries/blackfire-agent/1.34.0/blackfire-agent-linux_static_amd64 \
     && mv blackfire-agent /usr/local/bin/ \

docker/php-nginx-dev/7.3/Dockerfile

@@ -16,6 +16,7 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
 COPY conf/ /opt/docker/
 
 RUN set -x \
+    
     # Install development environment
     && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \
     && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \

docker/php-nginx-dev/7.4-alpine/Dockerfile

@@ -16,6 +16,7 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
 COPY conf/ /opt/docker/
 
 RUN set -x \
+    
     # Install development environment
     && wget -q -O blackfire-agent https://packages.blackfire.io/binaries/blackfire-agent/1.34.0/blackfire-agent-linux_static_amd64 \
     && mv blackfire-agent /usr/local/bin/ \

docker/php-nginx-dev/7.4/Dockerfile

@@ -16,6 +16,7 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
 COPY conf/ /opt/docker/
 
 RUN set -x \
+    
     # Install development environment
     && wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \
     && echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \

docker/php-nginx-dev/8.0-alpine/Dockerfile

@@ -16,13 +16,7 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
 COPY conf/ /opt/docker/
 
 RUN set -x \
-    # Install development environment
-    && wget -q -O blackfire-agent https://packages.blackfire.io/binaries/blackfire-agent/1.34.0/blackfire-agent-linux_static_amd64 \
-    && mv blackfire-agent /usr/local/bin/ \
-    && chmod +x /usr/local/bin/blackfire-agent \
-    && wget -q -O blackfire.so https://packages.blackfire.io/binaries/blackfire-php/1.33.0/blackfire-php-alpine_amd64-php-80.so \
-    && mv blackfire.so "$(php -r "echo ini_get('extension_dir');")/blackfire.so" \
-    && mkdir /var/run/blackfire/ \
+    
     && apk-install \
         make \
         autoconf \

docker/php-nginx-dev/8.0/Dockerfile

@@ -16,12 +16,7 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
 COPY conf/ /opt/docker/
 
 RUN set -x \
-    # Install development environment
-    && wget -q -O - https://packages.blackfire.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 \
+    
     && pickle install xdebug \
     && docker-php-ext-enable xdebug \
     # Enable php development services

template/Dockerfile/images/php.jinja2

@@ -364,12 +364,14 @@
 {%- endmacro %}
 
 {% macro officialDevelopment(role='', version='') -%}
+{%- if version != '8.0' %}
     # Install development environment
     && wget -q -O - https://packages.blackfire.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 \
 {%- elif version == '8.0' %}
@@ -384,13 +386,15 @@
 {%- endmacro %}
 
 {% macro officialDevelopmentAlpine(role='', version='') -%}
+{%- if version != '8.0' %}
     # Install development environment
     && wget -q -O blackfire-agent https://packages.blackfire.io/binaries/blackfire-agent/1.34.0/blackfire-agent-linux_static_amd64 \
     && mv blackfire-agent /usr/local/bin/ \
     && chmod +x /usr/local/bin/blackfire-agent \
     && wget -q -O blackfire.so https://packages.blackfire.io/binaries/blackfire-php/1.33.0/blackfire-php-alpine_amd64-php-{{ version|replace('.', '') }}.so \
     && mv blackfire.so "$(php -r "echo ini_get('extension_dir');")/blackfire.so" \
     && mkdir /var/run/blackfire/ \
+{%- endif %}
     && apk-install \
         make \
         autoconf \