From 5db6155e1121235b5e9ea7f83c56ec73bf091eb4 Mon Sep 17 00:00:00 2001 From: Dustin Rue Date: Tue, 19 Nov 2024 08:33:30 -0600 Subject: [PATCH 1/9] build php 8.4 --- .github/workflows/build.yaml | 2 +- .github/workflows/test-build.yaml | 2 +- README.md | 24 ++++++++++++++++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 8b77571..5e7c742 100644 --- a/.github/workflows/build.yaml +++ b/.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', '8.3'] + version: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4'] ubuntu-release-name: ['jammy', 'noble'] environment: name: Build diff --git a/.github/workflows/test-build.yaml b/.github/workflows/test-build.yaml index 0195c63..c15c9ea 100644 --- a/.github/workflows/test-build.yaml +++ b/.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', '8.3'] + version: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4'] ubuntu-release-name: ['jammy', 'noble'] environment: name: Build diff --git a/README.md b/README.md index 21d3700..951411d 100644 --- a/README.md +++ b/README.md @@ -86,6 +86,7 @@ Images are available under the tags: * 10up/wp-php-fpm:8.1-ubuntu * 10up/wp-php-fpm:8.2-ubuntu * 10up/wp-php-fpm:8.3-ubuntu + * 10up/wp-php-fpm:8.4-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 @@ -96,6 +97,29 @@ Images are available under the tags: * 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 + * ghcr.io/10up/wp-php-fpm:8.4-ubuntu +* Ubuntu 24.04 based (Docker Hub) + * 10up/wp-php-cpm:7.0-noble + * 10up/wp-php-cpm:7.1-noble + * 10up/wp-php-cpm:7.2-noble + * 10up/wp-php-cpm:7.3-noble + * 10up/wp-php-cpm:7.4-noble + * 10up/wp-php-cpm:8.0-noble + * 10up/wp-php-cpm:8.1-noble + * 10up/wp-php-cpm:8.2-noble + * 10up/wp-php-cpm:8.3-noble + * 10up/wp-php-cpm:8.4-noble +* Ubuntu 24.04 based (Github Packages) + * ghcr.io/10up/wp-php-cpm:7.0-noble + * ghcr.io/10up/wp-php-cpm:7.1-noble + * ghcr.io/10up/wp-php-cpm:7.2-noble + * ghcr.io/10up/wp-php-cpm:7.3-noble + * ghcr.io/10up/wp-php-cpm:7.4-noble + * ghcr.io/10up/wp-php-cpm:8.0-noble + * ghcr.io/10up/wp-php-cpm:8.1-noble + * ghcr.io/10up/wp-php-cpm:8.2-noble + * ghcr.io/10up/wp-php-cpm:8.3-noble + * ghcr.io/10up/wp-php-cpm:8.4-noble ## Support Level From 620ca533f0775c4d8a1c258f4bc2f1b101c8a65f Mon Sep 17 00:00:00 2001 From: Dustin Rue Date: Sun, 12 Jan 2025 10:28:58 -0600 Subject: [PATCH 2/9] test the build again --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 951411d..e52f477 100644 --- a/README.md +++ b/README.md @@ -131,4 +131,3 @@ Images are available under the tags:

- From c700f7c8af9f9fbffaefe791eba8d978b9c81ede Mon Sep 17 00:00:00 2001 From: Dustin Rue Date: Sun, 12 Jan 2025 10:36:31 -0600 Subject: [PATCH 3/9] update datadog agent version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 999d222..8c4c45a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,7 +35,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/1.2.0/datadog-setup.php -o /tmp/datadog-setup.php && \ + curl -LO https://github.com/DataDog/dd-trace-php/releases/download/1.6.2/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 --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 && \ From d24a96791af5183184b8cfb3bc8d61383282e45c Mon Sep 17 00:00:00 2001 From: Dustin Rue Date: Thu, 6 Mar 2025 15:11:56 -0600 Subject: [PATCH 4/9] version bumps for dd agent and new relic --- Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8c4c45a..89b521d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,16 +7,18 @@ FROM ${BASE_IMAGE}:${PHP_VERSION}-${UBUNTU_RELEASE_NAME} ARG PHP_VERSION=8.2 ARG TARGETPLATFORM +ARG DATADOG_AGENT_VERSION=1.7.1 ENV PHP_VERSION=${PHP_VERSION} + USER root RUN apt-get update; apt install php${PHP_VERSION}-fpm msmtp curl -y && apt clean all; rm -rf /var/lib/apt/lists/* # Routine to install newrelic agent RUN \ - if [[ "${TARGETPLATFORM}" = "linux/arm64" ]] || [[ "$(uname -m)" = "aarch64" ]]; then exit 0; fi ; export NR_AGENT_VERSION="newrelic-php5-11.0.0.13-linux.tar.gz"; curl -so - https://download.newrelic.com/php_agent/archive/11.0.0.13/${NR_AGENT_VERSION} | tar zxf - && \ + if [[ "${TARGETPLATFORM}" = "linux/arm64" ]] || [[ "$(uname -m)" = "aarch64" ]]; then exit 0; fi ; export NR_AGENT_VERSION="newrelic-php5-11.6.0.19-linux.tar.gz"; curl -so - https://download.newrelic.com/php_agent/archive/11.6.0.19/${NR_AGENT_VERSION} | tar zxf - && \ cd newrelic-php* && NR_INSTALL_SILENT=1 NR_INSTALL_USE_CP_NOT_LN=1 ./newrelic-install install && \ rm -rf /tmp/nrinstall* && \ echo 'newrelic.daemon.start_timeout = "5s"' >> /etc/php/${PHP_VERSION}/mods-available/newrelic.ini && \ @@ -35,7 +37,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/1.6.2/datadog-setup.php -o /tmp/datadog-setup.php && \ + curl -LO https://github.com/DataDog/dd-trace-php/releases/download/${DATADOG_AGENT_VERSION}/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 --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 && \ From c47744bac5a54564fa65c69b580ae1638123d30c Mon Sep 17 00:00:00 2001 From: Dustin Rue Date: Thu, 6 Mar 2025 15:29:12 -0600 Subject: [PATCH 5/9] does it segfault less if less parallel? --- .github/workflows/test-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-build.yaml b/.github/workflows/test-build.yaml index c15c9ea..b782abc 100644 --- a/.github/workflows/test-build.yaml +++ b/.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', '8.3', '8.4'] + version: ['8.4'] ubuntu-release-name: ['jammy', 'noble'] environment: name: Build From 321c50a488237357f82a894e4425f14548d48e68 Mon Sep 17 00:00:00 2001 From: Dustin Rue Date: Thu, 6 Mar 2025 16:13:56 -0600 Subject: [PATCH 6/9] Revert "does it segfault less if less parallel?" This reverts commit c47744bac5a54564fa65c69b580ae1638123d30c. --- .github/workflows/test-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-build.yaml b/.github/workflows/test-build.yaml index b782abc..c15c9ea 100644 --- a/.github/workflows/test-build.yaml +++ b/.github/workflows/test-build.yaml @@ -9,7 +9,7 @@ jobs: Build_PHP_Ubuntu_Test: strategy: matrix: - version: ['8.4'] + version: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4'] ubuntu-release-name: ['jammy', 'noble'] environment: name: Build From 46d01c6a8bd08cc395f13f093b466da41518f5b5 Mon Sep 17 00:00:00 2001 From: Dustin Rue Date: Thu, 6 Mar 2025 16:15:15 -0600 Subject: [PATCH 7/9] lower the number of parallel tasks --- .github/workflows/test-build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test-build.yaml b/.github/workflows/test-build.yaml index c15c9ea..1c4f1b4 100644 --- a/.github/workflows/test-build.yaml +++ b/.github/workflows/test-build.yaml @@ -8,6 +8,7 @@ on: jobs: Build_PHP_Ubuntu_Test: strategy: + max-parallel: 4 matrix: version: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4'] ubuntu-release-name: ['jammy', 'noble'] From 2555edb7e9f083f472477ccba467ac92e9e374f1 Mon Sep 17 00:00:00 2001 From: Dustin Rue Date: Thu, 6 Mar 2025 16:37:44 -0600 Subject: [PATCH 8/9] even lower number of parallel tasks --- .github/workflows/test-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-build.yaml b/.github/workflows/test-build.yaml index 1c4f1b4..2180180 100644 --- a/.github/workflows/test-build.yaml +++ b/.github/workflows/test-build.yaml @@ -8,7 +8,7 @@ on: jobs: Build_PHP_Ubuntu_Test: strategy: - max-parallel: 4 + max-parallel: 1 matrix: version: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4'] ubuntu-release-name: ['jammy', 'noble'] From 2fe2599ee67d2f0b7967787908e1c9a9c93ca2c2 Mon Sep 17 00:00:00 2001 From: Konstantinos Galanakis Date: Tue, 17 Feb 2026 16:33:56 +0200 Subject: [PATCH 9/9] Increase parallel tasks back to 4 --- .github/workflows/test-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-build.yaml b/.github/workflows/test-build.yaml index 2180180..1c4f1b4 100644 --- a/.github/workflows/test-build.yaml +++ b/.github/workflows/test-build.yaml @@ -8,7 +8,7 @@ on: jobs: Build_PHP_Ubuntu_Test: strategy: - max-parallel: 1 + max-parallel: 4 matrix: version: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4'] ubuntu-release-name: ['jammy', 'noble']