Browse Source

add new relic configurations to env && update new relice to stabile version

hsyam 4 years ago
parent
commit
5258e49373
2 changed files with 13 additions and 6 deletions
  1. 6 0
      env-example
  2. 7 6
      php-fpm/Dockerfile

+ 6 - 0
env-example

@@ -250,6 +250,12 @@ PHP_FPM_DEFAULT_LOCALE=POSIX
 PHP_FPM_PUID=1000
 PHP_FPM_PGID=1000
 
+### PHP_FPM_NEW_RELIC #####################################
+
+PHP_FPM_NEW_RELIC=false
+PHP_FPM_NEW_RELIC_KEY=0000
+PHP_FPM_NEW_RELIC_APP_NAME=app_name
+
 ### PHP_WORKER ############################################
 
 PHP_WORKER_INSTALL_BZ2=false

+ 7 - 6
php-fpm/Dockerfile

@@ -924,11 +924,12 @@ RUN if [ ${INSTALL_XMLRPC} = true ]; then \
 ###########################################################################
 # New Relic for PHP:
 ###########################################################################
+ARG NEW_RELIC=${NEW_RELIC}
+ARG NEW_RELIC_KEY=${NEW_RELIC_KEY}
+ARG NEW_RELIC_APP_NAME=${NEW_RELIC_APP_NAME}
 
-ARG NEW_RELIC_KEY=000000
-ARG NEW_RELIC_APP_NAME=app_name
-RUN \
-  curl -L http://download.newrelic.com/php_agent/release/newrelic-php5-9.13.0.270-linux.tar.gz | tar -C /tmp -zx && \
+RUN if [ ${NEW_RELIC} = true ]; then \
+  curl -L http://download.newrelic.com/php_agent/archive/9.9.0.260/newrelic-php5-9.9.0.260-linux.tar.gz | tar -C /tmp -zx && \
   export NR_INSTALL_USE_CP_NOT_LN=1 && \
   export NR_INSTALL_SILENT=1 && \
   /tmp/newrelic-php5-*/newrelic-install install && \
@@ -938,8 +939,8 @@ RUN \
   -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.start_timeout =.*/newrelic.daemon.start_timeout=5s/' \
-  /usr/local/etc/php/conf.d/newrelic.ini
-  
+  /usr/local/etc/php/conf.d/newrelic.ini \
+;fi
 ###########################################################################
 # Downgrade Openssl:
 ###########################################################################