Merge branch 'php8dot0' of github.com:moveis-simonetti/php-apache-oci8-composer into php8dot1

Author: lucassabreu

Dockerfile

@@ -66,7 +66,8 @@ RUN echo "---> Adding NewRelic" && \
     && chown www-data:www-data /usr/local/etc/php/conf.d/newrelic.ini && chmod a+rw /usr/local/etc/php/conf.d/newrelic.ini \
     && apt-get remove -y gnupg2 && rm -rf /var/lib/apt/lists/* \
     && echo "newrelic.distributed_tracing_enabled = false" | sudo tee -a /usr/local/etc/php/conf.d/newrelic.ini \
-    && echo "newrelic.application_logging.enabled = false" | sudo tee -a /usr/local/etc/php/conf.d/newrelic.ini
+    && echo "newrelic.application_logging.enabled = false" | sudo tee -a /usr/local/etc/php/conf.d/newrelic.ini \
+    && echo "newrelic.enabled = false" | sudo tee -a /usr/local/etc/php/conf.d/newrelic.ini
 
 RUN echo "---> Adding Tini" && \
     wget -O /tini https://github.com/krallin/tini/releases/download/v0.18.0/tini-static && \

apache-run.sh

@@ -1,15 +1,10 @@
 #!/bin/bash
 
 if [[ ${XDEBUG_ENABLED} == true ]]; then
-    sudo xdebug-set-mode ${XDEBUG_MODE:-debug}
+    sudo -E xdebug-set-mode ${XDEBUG_MODE:-debug}
 fi
 
-if [[ ${NR_ENABLED} == true ]]; then
-    sudo sed -i -e "s/"REPLACE_WITH_REAL_KEY"/${NR_LICENSE_KEY}/g" /usr/local/etc/php/conf.d/newrelic.ini
-    sudo sed -i -e "s/PHP Application/${NR_APP_NAME}/g" /usr/local/etc/php/conf.d/newrelic.ini
-else
-    echo "newrelic.enabled = false" | sudo tee -a /usr/local/etc/php/conf.d/newrelic.ini
-fi
+sudo -E newrelic-setup
 
 if [[ ${SESSION_HANDLER} == true ]]; then
     echo "session.save_handler = ${SESSION_HANDLER_NAME}" | sudo tee -a /usr/local/etc/php/conf.d/session-handler.ini

bin/newrelic-setup

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+if [[ ${NR_ENABLED} == true ]]; then
+    sed -i -e "s/"REPLACE_WITH_REAL_KEY"/${NR_LICENSE_KEY}/g" /usr/local/etc/php/conf.d/newrelic.ini
+    sed -i -e "s/PHP Application/${NR_APP_NAME}/g" /usr/local/etc/php/conf.d/newrelic.ini
+    echo "newrelic.enabled = true" | tee -a /usr/local/etc/php/conf.d/newrelic.ini
+else
+    echo "newrelic.enabled = false" | tee -a /usr/local/etc/php/conf.d/newrelic.ini
+fi