Skip to content

Commit 29bc152

Browse files
author
Igor Vitol
committed
Fix loading of blackfire - now it could be disabled or enabled by PHP_EXTENSIONS variable
1 parent 1ee8870 commit 29bc152

File tree

6 files changed

+6
-12
lines changed

6 files changed

+6
-12
lines changed

images/php/7.2-cli/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,7 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
134134
&& mkdir -p /tmp/blackfire \
135135
&& tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
136136
&& mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
137-
&& ( echo extension=blackfire.so \
138-
&& echo blackfire.agent_socket=tcp://blackfire:8707 ) > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
137+
&& echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
139138
&& rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
140139
RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
141140
&& rm -f /usr/local/lib/php/extensions/*/*sodium.so \

images/php/7.2-fpm/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,7 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
113113
&& mkdir -p /tmp/blackfire \
114114
&& tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
115115
&& mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
116-
&& ( echo extension=blackfire.so \
117-
&& echo blackfire.agent_socket=tcp://blackfire:8707 ) > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
116+
&& echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
118117
&& rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
119118
RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
120119
&& rm -f /usr/local/lib/php/extensions/*/*sodium.so \

images/php/7.3-cli/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,7 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
131131
&& mkdir -p /tmp/blackfire \
132132
&& tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
133133
&& mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
134-
&& ( echo extension=blackfire.so \
135-
&& echo blackfire.agent_socket=tcp://blackfire:8707 ) > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
134+
&& echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
136135
&& rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
137136
RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
138137
&& rm -f /usr/local/lib/php/extensions/*/*sodium.so \

images/php/7.3-fpm/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,7 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
110110
&& mkdir -p /tmp/blackfire \
111111
&& tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
112112
&& mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
113-
&& ( echo extension=blackfire.so \
114-
&& echo blackfire.agent_socket=tcp://blackfire:8707 ) > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
113+
&& echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
115114
&& rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
116115
RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
117116
&& rm -f /usr/local/lib/php/extensions/*/*sodium.so \

images/php/7.4-cli/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,7 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
121121
&& mkdir -p /tmp/blackfire \
122122
&& tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
123123
&& mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
124-
&& ( echo extension=blackfire.so \
125-
&& echo blackfire.agent_socket=tcp://blackfire:8707 ) > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
124+
&& echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
126125
&& rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
127126
RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
128127
&& rm -f /usr/local/lib/php/extensions/*/*sodium.so \

images/php/7.4-fpm/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,7 @@ RUN curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire
100100
&& mkdir -p /tmp/blackfire \
101101
&& tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
102102
&& mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
103-
&& ( echo extension=blackfire.so \
104-
&& echo blackfire.agent_socket=tcp://blackfire:8707 ) > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
103+
&& echo blackfire.agent_socket=tcp://blackfire:8707 > $(php -i | grep "additional .ini" | awk '{print $9}')/blackfire.ini \
105104
&& rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
106105
RUN rm -f /usr/local/etc/php/conf.d/*sodium.ini \
107106
&& rm -f /usr/local/lib/php/extensions/*/*sodium.so \

0 commit comments

Comments
 (0)