fix blackfile php8 alpine

webdevops · Dec 6, 2020 · 17b52b5 · 17b52b5
1 parent 26b67ef
commit 17b52b5
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 18 deletions.
diff --git a/docker/php-apache-dev/8.0-alpine/Dockerfile b/docker/php-apache-dev/8.0-alpine/Dockerfile
@@ -17,12 +17,6 @@ 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 \

diff --git a/docker/php-dev/8.0-alpine/Dockerfile b/docker/php-dev/8.0-alpine/Dockerfile
@@ -9,12 +9,6 @@ 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 \

diff --git a/docker/php-nginx-dev/8.0-alpine/Dockerfile b/docker/php-nginx-dev/8.0-alpine/Dockerfile
@@ -17,12 +17,6 @@ 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 \

diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2
@@ -380,12 +380,14 @@
 
 {% macro officialDevelopmentAlpine(role='', version='') -%}
     # Install development environment
+    {%- if version != '8.0' %}
     && 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 \