Skip to content

Commit f534868

Browse files
committed
Update blackfire and fix issue with permission
1 parent 9b897ae commit f534868

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

Dockerfile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ ARG version=8.1
22
ARG major=8
33
ARG composer1_version=1.10.26
44
ARG composer2_version=2.4.2
5-
ARG blackfire_version=1.80.0
65
ARG newrelic_version=9.21.0.311
76

87
FROM minidocks/base:3.15 AS v7.4
@@ -22,7 +21,6 @@ RUN getent group www-data >/dev/null || addgroup -g 82 -S www-data; getent passw
2221

2322
RUN if [ "$version" = "8.1" ]; then suffix="81"; else suffix="$major"; fi \
2423
&& for module in ctype curl iconv json mbstring openssl pcntl pecl-apcu phar posix tokenizer; do modules="$modules php$suffix-$module"; done \
25-
&& if [ "$version" == "7.2" ]; then libiconv_version="@community"; fi \
2624
&& apk add "gnu-libiconv$libiconv_version" "php$suffix" $modules && clean \
2725
&& if [ ! -f /usr/bin/php ]; then ln -s "/usr/bin/php$suffix" /usr/bin/php; fi \
2826
&& if [ ! -f /usr/bin/phar ]; then ln -s "/usr/bin/phar$suffix" /usr/bin/phar; fi \
@@ -81,6 +79,7 @@ RUN if [ "$version" = "8.1" ]; then suffix="81"; else suffix="$major"; fi \
8179
mysqli \
8280
mysqlnd \
8381
opcache \
82+
pecl-uploadprogress \
8483
pecl-redis \
8584
pecl-xdebug \
8685
pdo_mysql \
@@ -101,7 +100,6 @@ RUN if [ "$version" = "8.1" ]; then suffix="81"; else suffix="$major"; fi \
101100
; do modules="$modules php$suffix-$module"; done \
102101
&& if [ "$major" != "8" ]; then modules="$modules php$suffix-xmlrpc"; else modules="$modules php$suffix-pecl-xmlrpc@edge"; fi \
103102
&& if [ "$major" = "8" ] || [ "$version" = "7.4" ]; then modules="$modules php$suffix-ffi"; fi \
104-
&& if [ "$version" != "7.2" ]; then modules="$modules php$suffix-pecl-uploadprogress"; fi \
105103
&& if [ "$version" != "8.1" ]; then modules="$modules php$suffix-pecl-mcrypt"; else modules="$modules php$suffix-pecl-mcrypt@edge"; fi \
106104
&& apk add $modules \
107105
&& if [ ! -f /usr/bin/php-fpm ]; then ln -s "/usr/sbin/php-fpm$([ "$version" = "8.1" ] && echo "81" || echo $major)" /usr/bin/php-fpm; fi \
@@ -126,10 +124,10 @@ ENV PHP_EXT_XDEBUG=0 \
126124
RAWEXEC="$RAWEXEC php-fpm php-fpm$major"
127125

128126
ARG TARGETARCH
129-
ARG blackfire_version
130127

131128
# Blackfire
132-
RUN wget -O "/usr/lib/php${major}/modules/blackfire.so" https://packages.blackfire.io/binaries/blackfire-php/${blackfire_version}/blackfire-php-alpine_${TARGETARCH}-php-${version/./}.so \
129+
RUN wget -O "/tmp/blackfire.tar.gz" https://blackfire.io/api/v1/releases/probe/php/linux/${TARGETARCH}/${version/./} \
130+
&& tar -xzf /tmp/blackfire.tar.gz -C /tmp && mv /tmp/blackfire*.so /usr/lib/php${major}/modules/blackfire.so && clean \
133131
&& mkdir /var/run/blackfire \
134132
&& chmod a+x /var/run/blackfire/ "/usr/lib/php${major}/modules/blackfire.so" \
135133
&& echo -e "extension=blackfire.so\nblackfire.agent_socket=tcp://blackfire:8307" > "${PHP_INI_DIR}/conf.d/blackfire.ini"

0 commit comments

Comments
 (0)