Merge pull request #3049 from nisar-med/master

PHP-FPM: Fix arguments passed to PHP-FPM Dockerfile to install NEWRELIC
This commit is contained in:
Shao Yu-Lung (Allen) 2021-09-06 15:23:16 +08:00 committed by GitHub
commit 5ccb43659a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1132,8 +1132,8 @@ RUN if [ ${NEW_RELIC} = true ]; then \
/tmp/newrelic-php5-*/newrelic-install install && \ /tmp/newrelic-php5-*/newrelic-install install && \
rm -rf /tmp/newrelic-php5-* /tmp/nrinstall* && \ rm -rf /tmp/newrelic-php5-* /tmp/nrinstall* && \
sed -i \ sed -i \
-e 's/"REPLACE_WITH_REAL_KEY"/"${NEW_RELIC_KEY}"/' \ -e 's/"REPLACE_WITH_REAL_KEY"/"'${NEW_RELIC_KEY}'"/' \
-e 's/newrelic.appname = "PHP Application"/newrelic.appname = "${NEW_RELIC_APP_NAME}"/' \ -e 's/newrelic.appname = "PHP Application"/newrelic.appname = "'${NEW_RELIC_APP_NAME}'"/' \
-e 's/;newrelic.daemon.app_connect_timeout =.*/newrelic.daemon.app_connect_timeout=15s/' \ -e 's/;newrelic.daemon.app_connect_timeout =.*/newrelic.daemon.app_connect_timeout=15s/' \
-e 's/;newrelic.daemon.start_timeout =.*/newrelic.daemon.start_timeout=5s/' \ -e 's/;newrelic.daemon.start_timeout =.*/newrelic.daemon.start_timeout=5s/' \
/usr/local/etc/php/conf.d/newrelic.ini \ /usr/local/etc/php/conf.d/newrelic.ini \