Merge pull request #2342 from yamotuki/fix_xhprof_version

change to newer version of tideways/php-xhprof-extension
This commit is contained in:
Shao Yu-Lung (Allen) 2019-12-06 19:45:12 +08:00 committed by GitHub
commit 53558480e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -276,8 +276,8 @@ ARG INSTALL_XHPROF=false
RUN if [ ${INSTALL_XHPROF} = true ]; then \ RUN if [ ${INSTALL_XHPROF} = true ]; then \
# Install the php xhprof extension # Install the php xhprof extension
if [ $(php -r "echo PHP_MAJOR_VERSION;") = 7 ]; then \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = 7 ]; then \
curl -L -o /tmp/xhprof.tar.gz "https://github.com/tideways/php-xhprof-extension/archive/v4.1.7.tar.gz"; \ curl -L -o /tmp/xhprof.tar.gz "https://github.com/tideways/php-xhprof-extension/archive/v5.0.1.tar.gz"; \
else \ else \
curl -L -o /tmp/xhprof.tar.gz "https://codeload.github.com/phacility/xhprof/tar.gz/master"; \ curl -L -o /tmp/xhprof.tar.gz "https://codeload.github.com/phacility/xhprof/tar.gz/master"; \
fi \ fi \
&& mkdir -p xhprof \ && mkdir -p xhprof \

View File

@ -1,6 +1,6 @@
[xhprof] [xhprof]
; extension=xhprof.so ; extension=xhprof.so
extension=tideways.so extension=tideways_xhprof.so
xhprof.output_dir=/var/www/xhprof xhprof.output_dir=/var/www/xhprof
; no need to autoload, control in the program ; no need to autoload, control in the program
tideways.auto_prepend_library=0 tideways.auto_prepend_library=0