Merge pull request #26 from 10up/develop

bring develop into trunk for building

.github/workflows/build.yaml

@@ -11,7 +11,7 @@ jobs:
   Build_PHP_Ubuntu:
     strategy:
       matrix:
-        version: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
+        version: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
     environment:
       name: Build
     runs-on: ubuntu-latest
@@ -60,43 +60,6 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
 
-
-  Build_PHP_CentOS7:
-    strategy:
-      matrix:
-        version: ['7.0', '7.1']
-    environment:
-      name: Build
-    runs-on: ubuntu-latest
-    if: ${{ github.ref == 'refs/heads/trunk' }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ github.ref }}
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-
-      - name: Build and push CentOS based Docker images
-        uses: docker/build-push-action@v4
-        with:
-          push: true
-          context: centos7
-          platforms: linux/amd64
-          build-args: PHP_VERSION=${{ matrix.version }}
-          tags: ${{ secrets.IMAGE_NAME }}:${{ matrix.version }}
-
   Build_PHP_CentOS8:
     strategy:
       matrix:

.github/workflows/test-build.yaml

@@ -9,7 +9,7 @@ jobs:
   Build_PHP_Ubuntu_Test:
     strategy:
       matrix:
-        version: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
+        version: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
     environment:
       name: Build
     runs-on: ubuntu-latest
@@ -45,34 +45,6 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
 
 
-  Build_PHP_CentOS7_Test:
-    strategy:
-      matrix:
-        version: ['7.0', '7.1']
-    environment:
-      name: Build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ github.ref }}
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Build and push CentOS based Docker images
-        uses: docker/build-push-action@v4
-        with:
-          push: false
-          context: centos7
-          platforms: linux/amd64
-          build-args: PHP_VERSION=${{ matrix.version }}
-          tags: ${{ secrets.IMAGE_NAME }}:${{ matrix.version }}
-
   Build_PHP_CentOS8_Test:
     strategy:
       matrix:

Dockerfile

@@ -34,7 +34,7 @@ RUN \
 # You must set DD_AGENT_HOST and DD_TRACE_AGENT_PORT to point at your DD Agent
 # We also clean up whatever this config file layout is
 RUN \
-  curl -LO https://github.com/DataDog/dd-trace-php/releases/download/0.82.0/datadog-setup.php -o /tmp/datadog-setup.php && \
+  curl -LO https://github.com/DataDog/dd-trace-php/releases/download/0.94.0/datadog-setup.php -o /tmp/datadog-setup.php && \
   if [[ ${PHP_VERSION} = "5.6" ]] || [[ ${PHP_VERSION} = "7.0" ]]; then php datadog-setup.php --php-bin=all; else php datadog-setup.php --enable-profiling --php-bin=all; fi && \
   rm -f /tmp/datadog-setup.php && \ 
   mv /etc/php/${PHP_VERSION}/cli/conf.d/98-ddtrace.ini /etc/php/${PHP_VERSION}/mods-available/ddtrace.ini && \

README.md

@@ -69,8 +69,8 @@ Images are available under the tags:
 
 * CentOS 7 based
   * 10up/wp-php-fpm:5.6 (Deprecated, no longer refreshed)
-  * 10up/wp-php-fpm:7.0 (Deprecated)
-  * 10up/wp-php-fpm:7.1 (Deprecated)
+  * 10up/wp-php-fpm:7.0 (Deprecated, no longer refreshed)
+  * 10up/wp-php-fpm:7.1 (Deprecated, no longer refreshed)
 * Rocky Linux 8 based
   * 10up/wp-php-fpm:7.2 (Deprecated)
   * 10up/wp-php-fpm:7.3 (Deprecated)
@@ -85,6 +85,7 @@ Images are available under the tags:
   * 10up/wp-php-fpm:8.0-ubuntu
   * 10up/wp-php-fpm:8.1-ubuntu
   * 10up/wp-php-fpm:8.2-ubuntu
+  * 10up/wp-php-fpm:8.3-ubuntu
 * Ubuntu 22.04 based (Github Packages)
   * ghcr.io/10up/wp-php-fpm:7.0-ubuntu
   * ghcr.io/10up/wp-php-fpm:7.1-ubuntu
@@ -94,6 +95,7 @@ Images are available under the tags:
   * ghcr.io/10up/wp-php-fpm:8.0-ubuntu
   * ghcr.io/10up/wp-php-fpm:8.1-ubuntu
   * ghcr.io/10up/wp-php-fpm:8.2-ubuntu
+  * ghcr.io/10up/wp-php-fpm:8.3-ubuntu
 
 
 ## Support Level