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

Author: lucassabreu

.github/workflows/docker-build.yaml

@@ -0,0 +1,47 @@
+name: Publish Docker image
+
+on:
+  push:
+    branches: ["master", "php*"]
+
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+
+    permissions:
+      packages: write
+      contents: read
+
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v4
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: lojassimonetti/php-apache-oci8-composer
+
+      - name: Should push?
+        id: shoudPush
+        run: |
+          if [[ ${{ github.event.ref }} =~ ^refs/heads/php[0-9]dot[0-9]$ ]]; then
+              echo "match=true" >> $GITHUB_OUTPUT
+          elif [[ ${{ github.event.ref }} = "refs/heads/master" ]]; then
+              echo "match=true" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: ${{ steps.shoudPush.outputs.match == 'true' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

Dockerfile

@@ -1,9 +1,11 @@
 # Container Base
 FROM php:8.0-apache
 
-ENV http_proxy ${HTTP_PROXY}
-ENV https_proxy ${HTTP_PROXY}
+ENV http_proxy=${HTTP_PROXY}
+ENV https_proxy=${HTTP_PROXY}
 ENV NR_ENABLED=false
+ENV NR_DISTRIBUTED_TRACING_ENABLED=false
+ENV NR_APPLICATION_LOGGING_ENABLED=false
 ENV NR_APP_NAME=""
 ENV NR_LICENSE_KEY=""
 ENV NR_VERSION=""
@@ -29,7 +31,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends wget vim superv
     sudo zlib1g zlib1g-dev libzip4 libzip-dev zip unzip librabbitmq-dev musl-dev && \
     rm -rf /var/lib/apt/lists/*
 
-RUN a2enmod rewrite unique_id
+RUN a2enmod rewrite unique_id headers
 
 RUN docker-php-ext-configure gd --with-jpeg \
     && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
@@ -86,6 +88,7 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin/
     mkdir /var/www/.composer && chown -R www-data:www-data /var/www/.composer
 
 COPY configs/ports.conf /etc/apache2/ports.conf
+COPY configs/headers.conf /etc/apache2/conf-enabled/headers.conf
 COPY configs/logs.conf /etc/apache2/conf-enabled/logs.conf
 COPY configs/php-errors.ini /usr/local/etc/php/conf.d/php-errors.ini
 COPY apache-run.sh /usr/bin/apache-run

bin/newrelic-setup

@@ -4,7 +4,15 @@ 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
-    echo "newrelic.distributed_tracing_enabled = true" | tee -a /usr/local/etc/php/conf.d/newrelic.ini
+
+    if [[ ${NR_DISTRIBUTED_TRACING_ENABLED} == true ]]; then
+        echo "newrelic.distributed_tracing_enabled = true" | tee -a /usr/local/etc/php/conf.d/newrelic.ini
+    fi
+
+    if [[ ${NR_APPLICATION_LOGGING_ENABLED} == true ]]; then
+        echo "newrelic.application_logging.enabled = true" | tee -a /usr/local/etc/php/conf.d/newrelic.ini
+    fi
+
 else
     echo "newrelic.enabled = false" | tee -a /usr/local/etc/php/conf.d/newrelic.ini
 fi

configs/headers.conf

@@ -0,0 +1 @@
+Header append X-Request-UID "%{UNIQUE_ID}e"