Merge pull request #130 from bryanlatten/newrelic-space

Dockerfile: updated to latest NewRelic
behance · Apr 4, 2017 · 982b532 · 982b532
2 parents 8461f56 + f94920b
commit 982b532
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -23,7 +23,7 @@ ENV CONF_PHPFPM=/etc/php/7.0/fpm/php-fpm.conf \
     PHP_OPCACHE_MEMORY_CONSUMPTION=128 \
     PHP_OPCACHE_INTERNED_STRINGS_BUFFER=16 \
     PHP_OPCACHE_MAX_WASTED_PERCENTAGE=5 \
-    NEWRELIC_VERSION=7.0.0.186 \
+    NEWRELIC_VERSION=7.1.0.187 \
     CFG_APP_DEBUG=1
 
 # - Update security packages, only

diff --git a/Dockerfile-alpine b/Dockerfile-alpine
@@ -23,7 +23,7 @@ ENV CONF_PHPFPM=/etc/php7/php-fpm.conf \
     PHP_OPCACHE_MEMORY_CONSUMPTION=128 \
     PHP_OPCACHE_INTERNED_STRINGS_BUFFER=16 \
     PHP_OPCACHE_MAX_WASTED_PERCENTAGE=5 \
-    NEWRELIC_VERSION=7.0.0.186 \
+    NEWRELIC_VERSION=7.1.0.187 \
     CFG_APP_DEBUG=1
 
 RUN apk update && \
@@ -82,7 +82,8 @@ RUN apk update && \
     sed -i 's/zend_extension\s\?=/;zend_extension =/' $CONF_PHPMODS/xdebug.ini && \
     # Disable postgres by default \
     sed -i 's/extension\s\?=/;extension =/' $CONF_PHPMODS/00_pdo_pgsql.ini && \
-    sed -i 's/extension\s\?=/;extension =/' $CONF_PHPMODS/00_pgsql.ini
+    sed -i 's/extension\s\?=/;extension =/' $CONF_PHPMODS/00_pgsql.ini && \
+    /bin/bash -e /clean.sh
 
 # Install Alpine-compatible NewRelic, seed with variables to be replaced
 # Requires PHP to already be installed
@@ -93,9 +94,11 @@ RUN curl -L https://download.newrelic.com/php_agent/archive/${NEWRELIC_VERSION}/
     cd newrelic-php5-${NEWRELIC_VERSION}-linux-musl && \
     echo "\n" | ./newrelic-install install && \
     chown root:root /root/newrelic-php5-${NEWRELIC_VERSION}-linux-musl/agent/x64/newrelic-20151012.so && \
-    cp /root/newrelic-php5-${NEWRELIC_VERSION}-linux-musl/agent/x64/newrelic-20151012.so /usr/lib/php7/modules/newrelic.so && \
+    mv /root/newrelic-php5-${NEWRELIC_VERSION}-linux-musl/agent/x64/newrelic-20151012.so /usr/lib/php7/modules/newrelic.so && \
+    rm -rf /root/newrelic-php5-${NEWRELIC_VERSION}-linux-musl/agent/x64 && \
     # Fix permissions on extracted folder \
-    chown -R $NOT_ROOT_USER:$NOT_ROOT_USER *
+    chown -R $NOT_ROOT_USER:$NOT_ROOT_USER * && \
+    /bin/bash -e /clean.sh
 
 RUN curl -sS https://getcomposer.org/installer | php && \
     mv composer.phar /usr/local/bin/composer

diff --git a/Dockerfile-edge b/Dockerfile-edge
@@ -23,7 +23,7 @@ ENV CONF_PHPFPM=/etc/php/7.1/fpm/php-fpm.conf \
     PHP_OPCACHE_MEMORY_CONSUMPTION=128 \
     PHP_OPCACHE_INTERNED_STRINGS_BUFFER=16 \
     PHP_OPCACHE_MAX_WASTED_PERCENTAGE=5 \
-    NEWRELIC_VERSION=7.0.0.186 \
+    NEWRELIC_VERSION=7.1.0.187 \
     CFG_APP_DEBUG=1
 
 # - Update security packages, only

diff --git a/Dockerfile-legacy b/Dockerfile-legacy
@@ -23,7 +23,7 @@ ENV CONF_PHPFPM=/etc/php/5.6/fpm/php-fpm.conf \
     PHP_OPCACHE_MEMORY_CONSUMPTION=128 \
     PHP_OPCACHE_INTERNED_STRINGS_BUFFER=16 \
     PHP_OPCACHE_MAX_WASTED_PERCENTAGE=5 \
-    NEWRELIC_VERSION=7.0.0.186 \
+    NEWRELIC_VERSION=7.1.0.187 \
     CFG_APP_DEBUG=1
 
 # - Update security packages, only