Merge pull request #1554 from amazeeio/newrelic-upgrade

Update New Relic PHP Agent to 9.6.0.255 and pin Xdebug to 2.6.0 for PHP 7.0
uselagoon · Jan 21, 2020 · a391f6d · a391f6d
2 parents 0f80f9b + e6c6d3a
commit a391f6d
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/images/php/fpm/Dockerfile b/images/php/fpm/Dockerfile
@@ -35,8 +35,11 @@ COPY 00-lagoon-php.ini.tpl /usr/local/etc/php/conf.d/
 COPY php-fpm.d/www.conf /usr/local/etc/php-fpm.d/www.conf
 COPY ssmtp.conf /etc/ssmtp/ssmtp.conf
 
-# Defining Versions - https://docs.newrelic.com/docs/release-notes/agent-release-notes/php-release-notes/ / https://docs.newrelic.com/docs/agents/php-agent/getting-started/php-agent-compatibility-requirements
-ENV NEWRELIC_VERSION=9.3.0.248
+# New Relic PHP Agent.
+# Support for PHP 7.4 added in 9.4.
+# @see https://docs.newrelic.com/docs/release-notes/agent-release-notes/php-release-notes/
+# @see https://docs.newrelic.com/docs/agents/php-agent/getting-started/php-agent-compatibility-requirements
+ENV NEWRELIC_VERSION=9.6.0.255
 
 RUN apk add --no-cache fcgi \
         ssmtp \
@@ -63,6 +66,11 @@ RUN apk add --no-cache fcgi \
         && yes '' | pecl install -f xdebug-2.7.0 \
         && yes '' | pecl install -f redis-4.3.0; \
         ;; \
+      7.0*) \
+        yes '' | pecl install -f apcu \
+        && yes '' | pecl install -f xdebug-2.6.0 \
+        && yes '' | pecl install -f redis-4.3.0; \
+        ;; \
       7*) \
         yes '' | pecl install -f apcu \
         && yes '' | pecl install -f xdebug \