Merge pull request #155 from bryanlatten/feature-newrelic-72

Dockerfile: NewRelic supports PHP 7.2

Dockerfile-56

@@ -102,7 +102,7 @@ RUN apt-get update -q && \
     curl -sS https://getcomposer.org/installer | php && \
     mv composer.phar /usr/local/bin/composer && \
     # Install new PHP5-stable version of Redis \
-    pecl install redis-3.1.4 && \
+    pecl install redis-3.1.6 && \
     echo "extension=redis.so" > $CONF_PHPMODS/redis.ini && \
     # Remove dev packages that were only in place just to compile extensions
     apt-get remove --purge -yq \

Dockerfile-70

@@ -102,7 +102,7 @@ RUN apt-get update -q && \
     curl -sS https://getcomposer.org/installer | php && \
     mv composer.phar /usr/local/bin/composer && \
     # Install new PHP7-stable version of Redis \
-    pecl install redis-3.1.4 && \
+    pecl install redis-3.1.6 && \
     echo "extension=redis.so" > $CONF_PHPMODS/redis.ini && \
     # Remove dev packages that were only in place just to compile extensions
     apt-get remove --purge -yq \

Dockerfile-71

@@ -102,7 +102,7 @@ RUN apt-get update -q && \
     curl -sS https://getcomposer.org/installer | php && \
     mv composer.phar /usr/local/bin/composer && \
     # Install new PHP 7.1-stable version of Redis
-    pecl install redis-3.1.4 && \
+    pecl install redis-3.1.6 && \
     echo "extension=redis.so" > $CONF_PHPMODS/redis.ini && \
     # Remove dev packages that were only in place just to compile extensions
     apt-get remove --purge -yq \

Dockerfile-71-alpine

@@ -133,7 +133,7 @@ RUN apk update && \
     echo "extension=igbinary.so" > $CONF_PHPMODS/igbinary.ini && \
     pecl install yaml-2.0.2 && \
     echo ";extension=yaml.so" > $CONF_PHPMODS/yaml.ini && \
-    pecl install redis-3.1.4 && \
+    pecl install redis-3.1.6 && \
     echo ";extension=redis.so" > $CONF_PHPMODS/redis.ini && \
     pecl install msgpack-2.0.2 && \
     echo "extension=msgpack.so" > $CONF_PHPMODS/msgpack.ini && \

Dockerfile-72

@@ -53,9 +53,6 @@ RUN /bin/bash -e /security_updates.sh && \
 # TODO: fix these packages:
 # php7.2-mcrypt
 # php-xdebug
-# newrelic-php5
-# newrelic-php5-common
-# newrelic-daemon
 
 # Add PHP and support packages \
 RUN apt-get update -q && \
@@ -92,6 +89,9 @@ RUN apt-get update -q && \
         php7.2-xml \
         php7.2-yaml \
         php7.2-zip \
+        newrelic-php5 \
+        newrelic-php5-common \
+        newrelic-daemon \
     && \
     phpdismod pdo_pgsql && \
     phpdismod pgsql && \
@@ -105,7 +105,7 @@ RUN apt-get update -q && \
     curl -sS https://getcomposer.org/installer | php && \
     mv composer.phar /usr/local/bin/composer && \
     # Install new PHP 7.X-stable version of Redis
-    pecl install redis-3.1.4 && \
+    pecl install redis-3.1.6 && \
     echo "extension=redis.so" > $CONF_PHPMODS/redis.ini && \
     # Remove dev packages that were only in place just to compile extensions
     apt-get remove --purge -yq \
@@ -124,10 +124,7 @@ RUN cp /etc/php/7.0/mods-available/* $CONF_PHPMODS && \
     # Override default ini values for both CLI + FPM \
     phpenmod overrides && \
     # Enable NewRelic via Ubuntu symlinks, but disable in file. Cross-variant startup script uncomments with env vars.
-    # HACK: ensure file/folders exist so prep script still runs until NewRelic extension works with PHP 7.2
-    touch $CONF_PHPMODS/newrelic.ini && \
-    mkdir /var/log/newrelic && \
-    # phpenmod newrelic && \
+    phpenmod newrelic && \
     # - Run standard set of tweaks to ensure runs performant, reliably, and consistent between variants
     /bin/bash -e /prep-php.sh
 

container/root/tests/php-fpm/7.2.goss.yaml

@@ -240,16 +240,16 @@ file:
       - '/^request_terminate_timeout = \${PHP_FPM_MAX_EXECUTION_TIME}/'
       - '/^rlimit_files = 40000/'
       - '/^rlimit_core = unlimited/'
-  # /etc/php/7.2/mods-available/newrelic.ini:
-  #   exists: true
-  #   contains:
-  #     - '/^;extension =/'
-  #     - '/^newrelic.appname = \"\${REPLACE_NEWRELIC_APP}\"/'
-  #     - '/^newrelic.license = \"\${REPLACE_NEWRELIC_LICENSE}\"/'
-  #     - '/^newrelic.logfile = \"\/dev\/stdout\"/'
-  #     - '/^newrelic.daemon.logfile = \"\/dev\/stdout\"/'
-  #     - '/^newrelic.loglevel = \"warning\"/'
-  #     - '/^newrelic.daemon.loglevel = \"warning\"/'
+  /etc/php/7.2/mods-available/newrelic.ini:
+    exists: true
+    contains:
+      - '/^;extension =/'
+      - '/^newrelic.appname = \"\${REPLACE_NEWRELIC_APP}\"/'
+      - '/^newrelic.license = \"\${REPLACE_NEWRELIC_LICENSE}\"/'
+      - '/^newrelic.logfile = \"\/dev\/stdout\"/'
+      - '/^newrelic.daemon.logfile = \"\/dev\/stdout\"/'
+      - '/^newrelic.loglevel = \"warning\"/'
+      - '/^newrelic.daemon.loglevel = \"warning\"/'
   /etc/php/7.2/fpm/php-fpm.conf:
     exists: true
     contains: