|
@@ -78,14 +78,14 @@ RUN version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \
|
|
&& mkdir -p /tmp/blackfire \
|
|
&& mkdir -p /tmp/blackfire \
|
|
&& tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
|
|
&& tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
|
|
&& mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
|
|
&& mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
|
|
- && printf "extension=blackfire.so\nblackfire.agent_socket=tcp://blackfire:8307\n" > $PHP_INI_DIR/conf.d/blackfire.ini \
|
|
|
|
&& rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
|
|
&& rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
|
|
|
|
|
|
RUN curl -sS https://getcomposer.org/installer | \
|
|
RUN curl -sS https://getcomposer.org/installer | \
|
|
php -- --install-dir=/usr/local/bin --filename=composer
|
|
php -- --install-dir=/usr/local/bin --filename=composer
|
|
|
|
|
|
|
|
+COPY conf/blackfire.ini $PHP_INI_DIR/conf.d/blackfire.ini
|
|
COPY conf/msmtprc /etc/msmtprc
|
|
COPY conf/msmtprc /etc/msmtprc
|
|
-COPY conf/php.ini /usr/local/etc/php/
|
|
|
|
|
|
+COPY conf/php.ini $PHP_INI_DIR
|
|
COPY conf/php-fpm.conf /usr/local/etc/
|
|
COPY conf/php-fpm.conf /usr/local/etc/
|
|
COPY conf/www.conf /usr/local/etc/php-fpm.d/
|
|
COPY conf/www.conf /usr/local/etc/php-fpm.d/
|
|
|
|
|