From b7a03b7730c34c927265df07c794baa91e53ce07 Mon Sep 17 00:00:00 2001 From: Matthieu Napoli Date: Tue, 19 Sep 2023 13:09:44 +0200 Subject: [PATCH 01/27] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b7d7f26..4b921a2f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Change log +## 1.3.1 + +- Update PDO sqlsrv to 5.11.1 + ## 1.3.0 - Added extension SNMP From 0c068cfaa42663ecaf5ef0cf0a8b21b61a210a3d Mon Sep 17 00:00:00 2001 From: Bref Bot Date: Tue, 19 Sep 2023 11:21:22 +0000 Subject: [PATCH 02/27] Updated layers.json --- layers.json | 132 ++++++++++++++++++++++++++-------------------------- 1 file changed, 66 insertions(+), 66 deletions(-) diff --git a/layers.json b/layers.json index 0db7eb73..45c83a99 100644 --- a/layers.json +++ b/layers.json @@ -2448,76 +2448,76 @@ "me-south-1": 6 }, "sqlsrv-php-80": { - "ca-central-1": 14, - "eu-central-1": 14, - "eu-north-1": 14, - "eu-west-1": 14, - "eu-west-2": 14, - "eu-west-3": 14, - "sa-east-1": 14, - "us-east-1": 14, - "us-east-2": 14, - "us-west-1": 14, - "us-west-2": 14, - "ap-east-1": 11, - "ap-south-1": 14, - "ap-northeast-1": 14, - "ap-northeast-2": 14, - "ap-northeast-3": 11, - "ap-southeast-1": 14, - "ap-southeast-2": 14, - "eu-south-1": 14, - "eu-south-2": 5, - "af-south-1": 12, - "me-south-1": 9 + "ca-central-1": 16, + "eu-central-1": 16, + "eu-north-1": 16, + "eu-west-1": 16, + "eu-west-2": 16, + "eu-west-3": 16, + "sa-east-1": 16, + "us-east-1": 16, + "us-east-2": 16, + "us-west-1": 16, + "us-west-2": 16, + "ap-east-1": 13, + "ap-south-1": 16, + "ap-northeast-1": 16, + "ap-northeast-2": 16, + "ap-northeast-3": 13, + "ap-southeast-1": 16, + "ap-southeast-2": 16, + "eu-south-1": 16, + "eu-south-2": 7, + "af-south-1": 14, + "me-south-1": 11 }, "sqlsrv-php-81": { - "ca-central-1": 11, - "eu-central-1": 11, - "eu-north-1": 11, - "eu-west-1": 11, - "eu-west-2": 11, - "eu-west-3": 11, - "sa-east-1": 11, - "us-east-1": 11, - "us-east-2": 11, - "us-west-1": 11, - "us-west-2": 11, - "ap-east-1": 11, - "ap-south-1": 11, - "ap-northeast-1": 11, - "ap-northeast-2": 11, - "ap-northeast-3": 11, - "ap-southeast-1": 11, - "ap-southeast-2": 11, - "eu-south-1": 11, - "eu-south-2": 5, - "af-south-1": 9, - "me-south-1": 9 + "ca-central-1": 13, + "eu-central-1": 13, + "eu-north-1": 13, + "eu-west-1": 13, + "eu-west-2": 13, + "eu-west-3": 13, + "sa-east-1": 13, + "us-east-1": 13, + "us-east-2": 13, + "us-west-1": 13, + "us-west-2": 13, + "ap-east-1": 13, + "ap-south-1": 13, + "ap-northeast-1": 13, + "ap-northeast-2": 13, + "ap-northeast-3": 13, + "ap-southeast-1": 13, + "ap-southeast-2": 13, + "eu-south-1": 13, + "eu-south-2": 7, + "af-south-1": 11, + "me-south-1": 11 }, "sqlsrv-php-82": { - "ca-central-1": 7, - "eu-central-1": 7, - "eu-north-1": 7, - "eu-west-1": 7, - "eu-west-2": 7, - "eu-west-3": 7, - "sa-east-1": 7, - "us-east-1": 7, - "us-east-2": 7, - "us-west-1": 7, - "us-west-2": 7, - "ap-east-1": 7, - "ap-south-1": 7, - "ap-northeast-1": 7, - "ap-northeast-2": 7, - "ap-northeast-3": 7, - "ap-southeast-1": 7, - "ap-southeast-2": 7, - "eu-south-1": 7, - "eu-south-2": 5, - "af-south-1": 5, - "me-south-1": 5 + "ca-central-1": 9, + "eu-central-1": 9, + "eu-north-1": 9, + "eu-west-1": 9, + "eu-west-2": 9, + "eu-west-3": 9, + "sa-east-1": 9, + "us-east-1": 9, + "us-east-2": 9, + "us-west-1": 9, + "us-west-2": 9, + "ap-east-1": 9, + "ap-south-1": 9, + "ap-northeast-1": 9, + "ap-northeast-2": 9, + "ap-northeast-3": 9, + "ap-southeast-1": 9, + "ap-southeast-2": 9, + "eu-south-1": 9, + "eu-south-2": 7, + "af-south-1": 7, + "me-south-1": 7 }, "ssh2-php-80": { "ca-central-1": 10, From e77c04c66e247bf56f345405be316f028d7fc7d3 Mon Sep 17 00:00:00 2001 From: Bref Bot Date: Tue, 19 Sep 2023 16:35:01 +0000 Subject: [PATCH 03/27] Adding tag 1.3.1 --- config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.json b/config.json index 2e9b0f5b..6a1ed2b3 100644 --- a/config.json +++ b/config.json @@ -1,6 +1,6 @@ { "latest_versions": { "v0": "0.12.4", - "v1": "1.3.0" + "v1": "1.3.1" } } \ No newline at end of file From 41827e1721d366207df08e0e8761f4af624e0dda Mon Sep 17 00:00:00 2001 From: bref-bot <70405299+bref-bot@users.noreply.github.com> Date: Fri, 29 Sep 2023 07:57:13 +0200 Subject: [PATCH 04/27] Update Blackfire extension (#494) --- CHANGELOG.md | 4 + layers.json | 132 ++++++++++++++++----------------- layers/blackfire/versions.json | 6 +- 3 files changed, 73 insertions(+), 69 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b921a2f..8d1aa3aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Change log +## 1.3.2 + +- Updated Blackfire to version 1.90.0. + ## 1.3.1 - Update PDO sqlsrv to 5.11.1 diff --git a/layers.json b/layers.json index 45c83a99..23457ef3 100644 --- a/layers.json +++ b/layers.json @@ -72,76 +72,76 @@ "me-south-1": 5 }, "blackfire-php-80": { - "ca-central-1": 264, - "eu-central-1": 264, - "eu-north-1": 264, - "eu-west-1": 264, - "eu-west-2": 264, - "eu-west-3": 264, - "sa-east-1": 264, - "us-east-1": 264, - "us-east-2": 264, - "us-west-1": 264, - "us-west-2": 263, - "ap-east-1": 203, - "ap-south-1": 252, - "ap-northeast-1": 252, - "ap-northeast-2": 252, - "ap-northeast-3": 203, - "ap-southeast-1": 252, - "ap-southeast-2": 252, - "eu-south-1": 252, - "eu-south-2": 97, - "af-south-1": 227, - "me-south-1": 178 + "ca-central-1": 265, + "eu-central-1": 265, + "eu-north-1": 265, + "eu-west-1": 265, + "eu-west-2": 265, + "eu-west-3": 265, + "sa-east-1": 265, + "us-east-1": 265, + "us-east-2": 265, + "us-west-1": 265, + "us-west-2": 264, + "ap-east-1": 204, + "ap-south-1": 253, + "ap-northeast-1": 253, + "ap-northeast-2": 253, + "ap-northeast-3": 204, + "ap-southeast-1": 253, + "ap-southeast-2": 253, + "eu-south-1": 253, + "eu-south-2": 98, + "af-south-1": 228, + "me-south-1": 179 }, "blackfire-php-81": { - "ca-central-1": 199, - "eu-central-1": 199, - "eu-north-1": 199, - "eu-west-1": 199, - "eu-west-2": 199, - "eu-west-3": 199, - "sa-east-1": 199, - "us-east-1": 199, - "us-east-2": 199, - "us-west-1": 199, - "us-west-2": 199, - "ap-east-1": 199, - "ap-south-1": 199, - "ap-northeast-1": 199, - "ap-northeast-2": 199, - "ap-northeast-3": 199, - "ap-southeast-1": 199, - "ap-southeast-2": 199, - "eu-south-1": 199, - "eu-south-2": 97, - "af-south-1": 174, - "me-south-1": 174 + "ca-central-1": 200, + "eu-central-1": 200, + "eu-north-1": 200, + "eu-west-1": 200, + "eu-west-2": 200, + "eu-west-3": 200, + "sa-east-1": 200, + "us-east-1": 200, + "us-east-2": 200, + "us-west-1": 200, + "us-west-2": 200, + "ap-east-1": 200, + "ap-south-1": 200, + "ap-northeast-1": 200, + "ap-northeast-2": 200, + "ap-northeast-3": 200, + "ap-southeast-1": 200, + "ap-southeast-2": 200, + "eu-south-1": 200, + "eu-south-2": 98, + "af-south-1": 175, + "me-south-1": 175 }, "blackfire-php-82": { - "ca-central-1": 78, - "eu-central-1": 78, - "eu-north-1": 78, - "eu-west-1": 78, - "eu-west-2": 78, - "eu-west-3": 78, - "sa-east-1": 78, - "us-east-1": 78, - "us-east-2": 78, - "us-west-1": 78, - "us-west-2": 78, - "ap-east-1": 78, - "ap-south-1": 78, - "ap-northeast-1": 78, - "ap-northeast-2": 78, - "ap-northeast-3": 78, - "ap-southeast-1": 78, - "ap-southeast-2": 78, - "eu-south-1": 78, - "eu-south-2": 78, - "af-south-1": 78, - "me-south-1": 78 + "ca-central-1": 79, + "eu-central-1": 79, + "eu-north-1": 79, + "eu-west-1": 79, + "eu-west-2": 79, + "eu-west-3": 79, + "sa-east-1": 79, + "us-east-1": 79, + "us-east-2": 79, + "us-west-1": 79, + "us-west-2": 79, + "ap-east-1": 79, + "ap-south-1": 79, + "ap-northeast-1": 79, + "ap-northeast-2": 79, + "ap-northeast-3": 79, + "ap-southeast-1": 79, + "ap-southeast-2": 79, + "eu-south-1": 79, + "eu-south-2": 79, + "af-south-1": 79, + "me-south-1": 79 }, "bsdiff-php-80": { "ca-central-1": 3, diff --git a/layers/blackfire/versions.json b/layers/blackfire/versions.json index 695e5f63..769d4e19 100644 --- a/layers/blackfire/versions.json +++ b/layers/blackfire/versions.json @@ -1,5 +1,5 @@ { - "80": "1.89.0", - "81": "1.89.0", - "82": "1.89.0" + "80": "1.90.0", + "81": "1.90.0", + "82": "1.90.0" } \ No newline at end of file From a38c078064c6a632faefe88a5201cd194159b34b Mon Sep 17 00:00:00 2001 From: Gijs van Lammeren <42832118+starred-gijs@users.noreply.github.com> Date: Fri, 29 Sep 2023 07:58:37 +0200 Subject: [PATCH 05/27] Upgrade NewRelic agent to v10.12.0.1 (#493) --- layers/newrelic/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layers/newrelic/Dockerfile b/layers/newrelic/Dockerfile index f73d5c4f..b136a02a 100644 --- a/layers/newrelic/Dockerfile +++ b/layers/newrelic/Dockerfile @@ -3,7 +3,7 @@ ARG BREF_VERSION FROM bref/build-php-$PHP_VERSION:$BREF_VERSION AS ext # Build the New Relic Agent - install silently -ARG NEWRELIC_VERSION=10.11.0.3 +ARG NEWRELIC_VERSION=10.12.0.1 RUN \ curl -L https://download.newrelic.com/php_agent/archive/${NEWRELIC_VERSION}/newrelic-php5-${NEWRELIC_VERSION}-linux.tar.gz | tar -C /tmp -zx && \ export NR_INSTALL_USE_CP_NOT_LN=1 && \ From ca5c683f41c9912d4b494320d4aff22a5a285df6 Mon Sep 17 00:00:00 2001 From: bref-bot <70405299+bref-bot@users.noreply.github.com> Date: Fri, 20 Oct 2023 13:18:12 +0200 Subject: [PATCH 06/27] Adding tag 1.3.2 (#495) --- config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.json b/config.json index 6a1ed2b3..a4585bca 100644 --- a/config.json +++ b/config.json @@ -1,6 +1,6 @@ { "latest_versions": { "v0": "0.12.4", - "v1": "1.3.1" + "v1": "1.3.2" } } \ No newline at end of file From f15e4562d702d14f20a426506810460606d268e4 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Fri, 20 Oct 2023 12:18:46 +0100 Subject: [PATCH 07/27] Upgrade to redis 6.0.1 (#496) --- layers/redis/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layers/redis/Dockerfile b/layers/redis/Dockerfile index e9a03710..a3a1b5f8 100644 --- a/layers/redis/Dockerfile +++ b/layers/redis/Dockerfile @@ -2,7 +2,7 @@ ARG PHP_VERSION ARG BREF_VERSION FROM bref/build-php-$PHP_VERSION:$BREF_VERSION AS ext -RUN pecl install --force redis +RUN pecl install --force redis-6.0.1 RUN cp `php-config --extension-dir`/redis.so /tmp/redis.so RUN echo 'extension=redis.so' > /tmp/ext.ini From 5ee7ec323ce282716901e282958f5f44ca7558fc Mon Sep 17 00:00:00 2001 From: Gijs van Lammeren <42832118+starred-gijs@users.noreply.github.com> Date: Fri, 20 Oct 2023 13:19:08 +0200 Subject: [PATCH 08/27] Upgrade NewRelic agent to v10.13.0.2 (#497) --- layers/newrelic/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layers/newrelic/Dockerfile b/layers/newrelic/Dockerfile index b136a02a..4b6c7509 100644 --- a/layers/newrelic/Dockerfile +++ b/layers/newrelic/Dockerfile @@ -3,7 +3,7 @@ ARG BREF_VERSION FROM bref/build-php-$PHP_VERSION:$BREF_VERSION AS ext # Build the New Relic Agent - install silently -ARG NEWRELIC_VERSION=10.12.0.1 +ARG NEWRELIC_VERSION=10.13.0.2 RUN \ curl -L https://download.newrelic.com/php_agent/archive/${NEWRELIC_VERSION}/newrelic-php5-${NEWRELIC_VERSION}-linux.tar.gz | tar -C /tmp -zx && \ export NR_INSTALL_USE_CP_NOT_LN=1 && \ From d978d571c36c5f64af06253e0f2824160ac3706e Mon Sep 17 00:00:00 2001 From: Gijs van Lammeren <42832118+starred-gijs@users.noreply.github.com> Date: Wed, 15 Nov 2023 14:38:16 +0100 Subject: [PATCH 09/27] Upgrade NewRelic agent to v10.14.0.4 --- layers/newrelic/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layers/newrelic/Dockerfile b/layers/newrelic/Dockerfile index 4b6c7509..218bea95 100644 --- a/layers/newrelic/Dockerfile +++ b/layers/newrelic/Dockerfile @@ -3,7 +3,7 @@ ARG BREF_VERSION FROM bref/build-php-$PHP_VERSION:$BREF_VERSION AS ext # Build the New Relic Agent - install silently -ARG NEWRELIC_VERSION=10.13.0.2 +ARG NEWRELIC_VERSION=10.14.0.3 RUN \ curl -L https://download.newrelic.com/php_agent/archive/${NEWRELIC_VERSION}/newrelic-php5-${NEWRELIC_VERSION}-linux.tar.gz | tar -C /tmp -zx && \ export NR_INSTALL_USE_CP_NOT_LN=1 && \ From 621e4b1002edc9e9c4dfeab8d9cf265a05e462da Mon Sep 17 00:00:00 2001 From: Simon Merrick Date: Sun, 19 Nov 2023 23:20:12 +1300 Subject: [PATCH 10/27] Create a layer for the opentelemetrt php extension * https://github.com/open-telemetry/opentelemetry-php-instrumentation --- layers/opentelemetry/Dockerfile | 17 +++++++++++++++++ layers/opentelemetry/config.json | 7 +++++++ layers/opentelemetry/test.php | 8 ++++++++ 3 files changed, 32 insertions(+) create mode 100644 layers/opentelemetry/Dockerfile create mode 100644 layers/opentelemetry/config.json create mode 100644 layers/opentelemetry/test.php diff --git a/layers/opentelemetry/Dockerfile b/layers/opentelemetry/Dockerfile new file mode 100644 index 00000000..cb4b12c5 --- /dev/null +++ b/layers/opentelemetry/Dockerfile @@ -0,0 +1,17 @@ +# https://github.com/brefphp/extra-php-extensions/blob/master/layers/yaml/Dockerfile + +ARG PHP_VERSION +ARG BREF_VERSION +FROM bref/build-php-$PHP_VERSION:$BREF_VERSION AS ext + +RUN MAKEFLAGS="-j $(nproc)" && pecl install opentelemetry > /dev/null +RUN cp `php-config --extension-dir`/opentelemetry.so /tmp/opentelemetry.so +RUN strip --strip-debug /tmp/opentelemetry.so +RUN echo 'extension=opentelemetry.so' > /tmp/ext.ini + +# Build the final image with just the files we need +FROM scratch + +# Copy things we installed to the final image +COPY --from=ext /tmp/opentelemetry.so /opt/bref/extensions/opentelemetry.so +COPY --from=ext /tmp/ext.ini /opt/bref/etc/php/conf.d/ext-opentelemetry.ini diff --git a/layers/opentelemetry/config.json b/layers/opentelemetry/config.json new file mode 100644 index 00000000..a5a35316 --- /dev/null +++ b/layers/opentelemetry/config.json @@ -0,0 +1,7 @@ +{ + "php": [ + "80", + "81", + "82" + ] +} diff --git a/layers/opentelemetry/test.php b/layers/opentelemetry/test.php new file mode 100644 index 00000000..f7fe507c --- /dev/null +++ b/layers/opentelemetry/test.php @@ -0,0 +1,8 @@ + Date: Mon, 20 Nov 2023 20:41:00 +1300 Subject: [PATCH 11/27] Pin opentelemetry version, tidy PR --- layers/opentelemetry/Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/layers/opentelemetry/Dockerfile b/layers/opentelemetry/Dockerfile index cb4b12c5..1d5fa9aa 100644 --- a/layers/opentelemetry/Dockerfile +++ b/layers/opentelemetry/Dockerfile @@ -1,10 +1,8 @@ -# https://github.com/brefphp/extra-php-extensions/blob/master/layers/yaml/Dockerfile - ARG PHP_VERSION ARG BREF_VERSION FROM bref/build-php-$PHP_VERSION:$BREF_VERSION AS ext -RUN MAKEFLAGS="-j $(nproc)" && pecl install opentelemetry > /dev/null +RUN MAKEFLAGS="-j $(nproc)" && pecl install opentelemetry-1.0.0 > /dev/null RUN cp `php-config --extension-dir`/opentelemetry.so /tmp/opentelemetry.so RUN strip --strip-debug /tmp/opentelemetry.so RUN echo 'extension=opentelemetry.so' > /tmp/ext.ini From bb6854da8ea7c74c09c41f027d78d6ec56a2de41 Mon Sep 17 00:00:00 2001 From: Simon Merrick Date: Mon, 20 Nov 2023 20:59:14 +1300 Subject: [PATCH 12/27] Fix whitespace --- layers/opentelemetry/test.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/layers/opentelemetry/test.php b/layers/opentelemetry/test.php index f7fe507c..2a3e6384 100644 --- a/layers/opentelemetry/test.php +++ b/layers/opentelemetry/test.php @@ -1,7 +1,7 @@ Date: Wed, 22 Nov 2023 10:15:24 +1300 Subject: [PATCH 13/27] Drop MAKEFLAGS --- layers/opentelemetry/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layers/opentelemetry/Dockerfile b/layers/opentelemetry/Dockerfile index 1d5fa9aa..ae61d01d 100644 --- a/layers/opentelemetry/Dockerfile +++ b/layers/opentelemetry/Dockerfile @@ -2,7 +2,7 @@ ARG PHP_VERSION ARG BREF_VERSION FROM bref/build-php-$PHP_VERSION:$BREF_VERSION AS ext -RUN MAKEFLAGS="-j $(nproc)" && pecl install opentelemetry-1.0.0 > /dev/null +RUN pecl install opentelemetry-1.0.0 > /dev/null RUN cp `php-config --extension-dir`/opentelemetry.so /tmp/opentelemetry.so RUN strip --strip-debug /tmp/opentelemetry.so RUN echo 'extension=opentelemetry.so' > /tmp/ext.ini From ed8c68f286fc19ce30e002024fea33606b39093e Mon Sep 17 00:00:00 2001 From: Simon Merrick Date: Wed, 22 Nov 2023 10:33:58 +1300 Subject: [PATCH 14/27] Revert "Drop MAKEFLAGS" This reverts commit 7258cc9fca2e08487c473aa0be60d3c1d262ab6b. --- layers/opentelemetry/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layers/opentelemetry/Dockerfile b/layers/opentelemetry/Dockerfile index ae61d01d..1d5fa9aa 100644 --- a/layers/opentelemetry/Dockerfile +++ b/layers/opentelemetry/Dockerfile @@ -2,7 +2,7 @@ ARG PHP_VERSION ARG BREF_VERSION FROM bref/build-php-$PHP_VERSION:$BREF_VERSION AS ext -RUN pecl install opentelemetry-1.0.0 > /dev/null +RUN MAKEFLAGS="-j $(nproc)" && pecl install opentelemetry-1.0.0 > /dev/null RUN cp `php-config --extension-dir`/opentelemetry.so /tmp/opentelemetry.so RUN strip --strip-debug /tmp/opentelemetry.so RUN echo 'extension=opentelemetry.so' > /tmp/ext.ini From 79bd812eb3946d62ac6eb33f25dd85a80cb2d307 Mon Sep 17 00:00:00 2001 From: Simon Merrick Date: Wed, 22 Nov 2023 11:14:54 +1300 Subject: [PATCH 15/27] Drop && --- layers/opentelemetry/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layers/opentelemetry/Dockerfile b/layers/opentelemetry/Dockerfile index 1d5fa9aa..ad6f63e6 100644 --- a/layers/opentelemetry/Dockerfile +++ b/layers/opentelemetry/Dockerfile @@ -2,7 +2,7 @@ ARG PHP_VERSION ARG BREF_VERSION FROM bref/build-php-$PHP_VERSION:$BREF_VERSION AS ext -RUN MAKEFLAGS="-j $(nproc)" && pecl install opentelemetry-1.0.0 > /dev/null +RUN MAKEFLAGS="-j $(nproc)" pecl install opentelemetry-1.0.0 > /dev/null RUN cp `php-config --extension-dir`/opentelemetry.so /tmp/opentelemetry.so RUN strip --strip-debug /tmp/opentelemetry.so RUN echo 'extension=opentelemetry.so' > /tmp/ext.ini From 6ce33f4f16c0dfff8401996febeb471866b87d85 Mon Sep 17 00:00:00 2001 From: Simon Merrick Date: Wed, 22 Nov 2023 21:15:25 +1300 Subject: [PATCH 16/27] Add opentelemetry to the Readme.md --- Readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Readme.md b/Readme.md index 661e3a9a..8ca9a756 100644 --- a/Readme.md +++ b/Readme.md @@ -77,6 +77,7 @@ functions: | Newrelic | `${bref-extra:newrelic-php-81}` | | ODBC Snowflake | `${bref-extra:odbc-snowflake-php-81}` | | OpenSwoole | `${bref-extra:openswoole-php-81}` | +| OpenTelemetry | `${bref-extra:opentelemetry-php-81}` | | Oracle | `${bref-extra:oci8-php-80}` | | Pcov | `${bref-extra:pcov-php-81}` | | PostgreSQL | `${bref-extra:pgsql-php-81}` | From 92d518847ffd02250b06908c27c9c253488c4a14 Mon Sep 17 00:00:00 2001 From: Bref Bot Date: Thu, 30 Nov 2023 05:54:18 +0000 Subject: [PATCH 17/27] Update Blackfire extension --- CHANGELOG.md | 4 + layers.json | 132 ++++++++++++++++----------------- layers/blackfire/versions.json | 6 +- 3 files changed, 73 insertions(+), 69 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d1aa3aa..feb99050 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Change log +## 1.3.3 + +- Updated Blackfire to version 1.92.2. + ## 1.3.2 - Updated Blackfire to version 1.90.0. diff --git a/layers.json b/layers.json index 23457ef3..4a87a61d 100644 --- a/layers.json +++ b/layers.json @@ -72,76 +72,76 @@ "me-south-1": 5 }, "blackfire-php-80": { - "ca-central-1": 265, - "eu-central-1": 265, - "eu-north-1": 265, - "eu-west-1": 265, - "eu-west-2": 265, - "eu-west-3": 265, - "sa-east-1": 265, - "us-east-1": 265, - "us-east-2": 265, - "us-west-1": 265, - "us-west-2": 264, - "ap-east-1": 204, - "ap-south-1": 253, - "ap-northeast-1": 253, - "ap-northeast-2": 253, - "ap-northeast-3": 204, - "ap-southeast-1": 253, - "ap-southeast-2": 253, - "eu-south-1": 253, - "eu-south-2": 98, - "af-south-1": 228, - "me-south-1": 179 + "ca-central-1": 289, + "eu-central-1": 289, + "eu-north-1": 289, + "eu-west-1": 289, + "eu-west-2": 289, + "eu-west-3": 289, + "sa-east-1": 289, + "us-east-1": 289, + "us-east-2": 289, + "us-west-1": 289, + "us-west-2": 288, + "ap-east-1": 228, + "ap-south-1": 277, + "ap-northeast-1": 277, + "ap-northeast-2": 277, + "ap-northeast-3": 228, + "ap-southeast-1": 277, + "ap-southeast-2": 277, + "eu-south-1": 277, + "eu-south-2": 122, + "af-south-1": 252, + "me-south-1": 203 }, "blackfire-php-81": { - "ca-central-1": 200, - "eu-central-1": 200, - "eu-north-1": 200, - "eu-west-1": 200, - "eu-west-2": 200, - "eu-west-3": 200, - "sa-east-1": 200, - "us-east-1": 200, - "us-east-2": 200, - "us-west-1": 200, - "us-west-2": 200, - "ap-east-1": 200, - "ap-south-1": 200, - "ap-northeast-1": 200, - "ap-northeast-2": 200, - "ap-northeast-3": 200, - "ap-southeast-1": 200, - "ap-southeast-2": 200, - "eu-south-1": 200, - "eu-south-2": 98, - "af-south-1": 175, - "me-south-1": 175 + "ca-central-1": 224, + "eu-central-1": 224, + "eu-north-1": 224, + "eu-west-1": 224, + "eu-west-2": 224, + "eu-west-3": 224, + "sa-east-1": 224, + "us-east-1": 224, + "us-east-2": 224, + "us-west-1": 224, + "us-west-2": 224, + "ap-east-1": 224, + "ap-south-1": 224, + "ap-northeast-1": 224, + "ap-northeast-2": 224, + "ap-northeast-3": 224, + "ap-southeast-1": 224, + "ap-southeast-2": 224, + "eu-south-1": 224, + "eu-south-2": 122, + "af-south-1": 199, + "me-south-1": 199 }, "blackfire-php-82": { - "ca-central-1": 79, - "eu-central-1": 79, - "eu-north-1": 79, - "eu-west-1": 79, - "eu-west-2": 79, - "eu-west-3": 79, - "sa-east-1": 79, - "us-east-1": 79, - "us-east-2": 79, - "us-west-1": 79, - "us-west-2": 79, - "ap-east-1": 79, - "ap-south-1": 79, - "ap-northeast-1": 79, - "ap-northeast-2": 79, - "ap-northeast-3": 79, - "ap-southeast-1": 79, - "ap-southeast-2": 79, - "eu-south-1": 79, - "eu-south-2": 79, - "af-south-1": 79, - "me-south-1": 79 + "ca-central-1": 103, + "eu-central-1": 103, + "eu-north-1": 103, + "eu-west-1": 103, + "eu-west-2": 103, + "eu-west-3": 103, + "sa-east-1": 103, + "us-east-1": 103, + "us-east-2": 103, + "us-west-1": 103, + "us-west-2": 103, + "ap-east-1": 103, + "ap-south-1": 103, + "ap-northeast-1": 103, + "ap-northeast-2": 103, + "ap-northeast-3": 103, + "ap-southeast-1": 103, + "ap-southeast-2": 103, + "eu-south-1": 103, + "eu-south-2": 103, + "af-south-1": 103, + "me-south-1": 103 }, "bsdiff-php-80": { "ca-central-1": 3, diff --git a/layers/blackfire/versions.json b/layers/blackfire/versions.json index 769d4e19..49df05e3 100644 --- a/layers/blackfire/versions.json +++ b/layers/blackfire/versions.json @@ -1,5 +1,5 @@ { - "80": "1.90.0", - "81": "1.90.0", - "82": "1.90.0" + "80": "1.92.2", + "81": "1.92.2", + "82": "1.92.2" } \ No newline at end of file From fe21d70c30cd1a5b3583665dd82c59c6a81eab62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20M=C3=B6nch?= Date: Thu, 30 Nov 2023 09:27:38 +0100 Subject: [PATCH 18/27] Update redis to v6.0.2 and make it available for PHP 8.3 --- layers/redis/Dockerfile | 2 +- layers/redis/config.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/layers/redis/Dockerfile b/layers/redis/Dockerfile index a3a1b5f8..acc01405 100644 --- a/layers/redis/Dockerfile +++ b/layers/redis/Dockerfile @@ -2,7 +2,7 @@ ARG PHP_VERSION ARG BREF_VERSION FROM bref/build-php-$PHP_VERSION:$BREF_VERSION AS ext -RUN pecl install --force redis-6.0.1 +RUN pecl install --force redis-6.0.2 RUN cp `php-config --extension-dir`/redis.so /tmp/redis.so RUN echo 'extension=redis.so' > /tmp/ext.ini diff --git a/layers/redis/config.json b/layers/redis/config.json index a5a35316..eea4b0f4 100644 --- a/layers/redis/config.json +++ b/layers/redis/config.json @@ -2,6 +2,7 @@ "php": [ "80", "81", - "82" + "82", + "83" ] } From 8e7a4625ed2e2f61c9adf723a404ac437329af8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20M=C3=B6nch?= Date: Thu, 30 Nov 2023 09:35:25 +0100 Subject: [PATCH 19/27] Update tidways to v5.6.6 and make it available for PHP 8.3 --- layers/tideways/Dockerfile | 2 +- layers/tideways/config.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/layers/tideways/Dockerfile b/layers/tideways/Dockerfile index ff46bbc0..b8f860b2 100644 --- a/layers/tideways/Dockerfile +++ b/layers/tideways/Dockerfile @@ -3,7 +3,7 @@ ARG PHP_VERSION ARG BREF_VERSION FROM bref/build-php-$PHP_VERSION:$BREF_VERSION AS ext -ARG TIDEWAYS_VERSION=5.5.14 +ARG TIDEWAYS_VERSION=5.6.6 # Versions: https://tideways.com/profiler/downloads # Docs: https://app.tideways.io/o/Bref/Bref-Tideways/installation diff --git a/layers/tideways/config.json b/layers/tideways/config.json index a5a35316..eea4b0f4 100644 --- a/layers/tideways/config.json +++ b/layers/tideways/config.json @@ -2,6 +2,7 @@ "php": [ "80", "81", - "82" + "82", + "83" ] } From 7ced4db7044d6ae61968753ba2718e45a8260d56 Mon Sep 17 00:00:00 2001 From: evo-chris <96132962+evo-chris@users.noreply.github.com> Date: Thu, 30 Nov 2023 09:07:11 +0000 Subject: [PATCH 20/27] Update Relay to v0.6.8 and support PHP 8.3 --- layers/relay/Dockerfile | 2 +- layers/relay/config.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/layers/relay/Dockerfile b/layers/relay/Dockerfile index 27954170..5e608350 100644 --- a/layers/relay/Dockerfile +++ b/layers/relay/Dockerfile @@ -3,7 +3,7 @@ ARG PHP_VERSION ARG BREF_VERSION FROM bref/build-php-$PHP_VERSION:2 AS ext -ARG RELAY_VERSION=0.6.0 +ARG RELAY_VERSION=0.6.8 # Docs: https://relay.so/docs/1.x/installation#manual-installation diff --git a/layers/relay/config.json b/layers/relay/config.json index a5a35316..eea4b0f4 100644 --- a/layers/relay/config.json +++ b/layers/relay/config.json @@ -2,6 +2,7 @@ "php": [ "80", "81", - "82" + "82", + "83" ] } From 361ece2b88daed44168fc6763eb2d5fb0fdb5091 Mon Sep 17 00:00:00 2001 From: Aran Reeks <3313791+aran112000@users.noreply.github.com> Date: Wed, 6 Dec 2023 11:59:04 +0000 Subject: [PATCH 21/27] WIP - Update dependancies readying for PHP 8.3 support Pending an upstream fix being merged here: https://github.com/Imagick/imagick/pull/641 --- layers/imagick/Dockerfile | 17 +++++++++-------- layers/imagick/config.json | 3 ++- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/layers/imagick/Dockerfile b/layers/imagick/Dockerfile index d820bdd1..2eae6749 100644 --- a/layers/imagick/Dockerfile +++ b/layers/imagick/Dockerfile @@ -10,9 +10,9 @@ RUN LD_LIBRARY_PATH= yum -y install libpng-devel libjpeg-devel lcms2-devel Image # Compile libwebp since AL2 ships with v0.3, and v0.4 or higher is required to builder the other libs WORKDIR ${IMAGICK_BUILD_DIR} -RUN curl -Ls -o libwebp.tar.gz https://github.com/webmproject/libwebp/archive/refs/tags/v1.3.1.tar.gz +RUN curl -Ls -o libwebp.tar.gz https://github.com/webmproject/libwebp/archive/refs/tags/v1.3.2.tar.gz RUN tar xzf libwebp.tar.gz -WORKDIR ${IMAGICK_BUILD_DIR}/libwebp-1.3.1 +WORKDIR ${IMAGICK_BUILD_DIR}/libwebp-1.3.2 RUN autoreconf -i && automake && autoconf RUN ./configure --prefix ${INSTALL_DIR} --exec-prefix ${INSTALL_DIR} RUN make -j $(nproc) @@ -20,18 +20,18 @@ RUN make install # Compile libde265 (libheif dependency) WORKDIR ${IMAGICK_BUILD_DIR} -RUN curl -Ls -o libde265.tar.gz https://github.com/strukturag/libde265/releases/download/v1.0.12/libde265-1.0.12.tar.gz +RUN curl -Ls -o libde265.tar.gz https://github.com/strukturag/libde265/releases/download/v1.0.14/libde265-1.0.14.tar.gz RUN tar xzf libde265.tar.gz -WORKDIR ${IMAGICK_BUILD_DIR}/libde265-1.0.12 +WORKDIR ${IMAGICK_BUILD_DIR}/libde265-1.0.14 RUN ./configure --prefix ${INSTALL_DIR} --exec-prefix ${INSTALL_DIR} RUN make -j $(nproc) RUN make install # Compile libheif WORKDIR ${IMAGICK_BUILD_DIR} -RUN curl -Ls -o libheif.tar.gz https://github.com/strukturag/libheif/releases/download/v1.13.0/libheif-1.13.0.tar.gz +RUN curl -Ls -o libheif.tar.gz https://github.com/strukturag/libheif/releases/download/v1.17.5/libheif-1.17.5.tar.gz RUN tar xzf libheif.tar.gz -WORKDIR ${IMAGICK_BUILD_DIR}/libheif-1.13.0 +WORKDIR ${IMAGICK_BUILD_DIR}/libheif-1.17.5 RUN ./configure --prefix ${INSTALL_DIR} --exec-prefix ${INSTALL_DIR} RUN make -j $(nproc) RUN make install @@ -47,9 +47,9 @@ RUN cp bin/gs /tmp/gs # Compile the ImageMagick library WORKDIR ${IMAGICK_BUILD_DIR} -RUN curl -Ls -o ImageMagick.tar.gz https://github.com/ImageMagick/ImageMagick/archive/refs/tags/7.1.1-15.tar.gz +RUN curl -Ls -o ImageMagick.tar.gz https://github.com/ImageMagick/ImageMagick/archive/refs/tags/7.1.1-22.tar.gz RUN tar xzf ImageMagick.tar.gz -WORKDIR ${IMAGICK_BUILD_DIR}/ImageMagick-7.1.1-15 +WORKDIR ${IMAGICK_BUILD_DIR}/ImageMagick-7.1.1-22 RUN ./configure --prefix ${INSTALL_DIR} --exec-prefix ${INSTALL_DIR} --with-webp --with-heic --disable-static --with-freetype=yes RUN make -j $(nproc) RUN make install @@ -61,6 +61,7 @@ RUN convert -list configure WORKDIR ${IMAGICK_BUILD_DIR} RUN git clone https://github.com/Imagick/imagick WORKDIR ${IMAGICK_BUILD_DIR}/imagick +# TODO; update the commit hash this PR has been merged with PHP 8.3 support: https://github.com/Imagick/imagick/pull/641 RUN git reset --hard 28f27044e435a2b203e32675e942eb8de620ee58 RUN phpize RUN ./configure --with-imagick=${INSTALL_DIR} diff --git a/layers/imagick/config.json b/layers/imagick/config.json index a5a35316..eea4b0f4 100644 --- a/layers/imagick/config.json +++ b/layers/imagick/config.json @@ -2,6 +2,7 @@ "php": [ "80", "81", - "82" + "82", + "83" ] } From 4f5b73e8868f346e52afb9e7f33d7cf963543728 Mon Sep 17 00:00:00 2001 From: Aran Reeks <3313791+aran112000@users.noreply.github.com> Date: Wed, 6 Dec 2023 11:59:49 +0000 Subject: [PATCH 22/27] Fix typo --- layers/imagick/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layers/imagick/Dockerfile b/layers/imagick/Dockerfile index 2eae6749..6f4f4db4 100644 --- a/layers/imagick/Dockerfile +++ b/layers/imagick/Dockerfile @@ -61,7 +61,7 @@ RUN convert -list configure WORKDIR ${IMAGICK_BUILD_DIR} RUN git clone https://github.com/Imagick/imagick WORKDIR ${IMAGICK_BUILD_DIR}/imagick -# TODO; update the commit hash this PR has been merged with PHP 8.3 support: https://github.com/Imagick/imagick/pull/641 +# TODO; update the commit hash once this PR has been merged with PHP 8.3 support: https://github.com/Imagick/imagick/pull/641 RUN git reset --hard 28f27044e435a2b203e32675e942eb8de620ee58 RUN phpize RUN ./configure --with-imagick=${INSTALL_DIR} From 2be1e53b484cec306ebc41b6ea40ef37c0754184 Mon Sep 17 00:00:00 2001 From: Aran Reeks <3313791+aran112000@users.noreply.github.com> Date: Wed, 6 Dec 2023 13:16:04 +0000 Subject: [PATCH 23/27] libheif build process has changed --- layers/imagick/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layers/imagick/Dockerfile b/layers/imagick/Dockerfile index 6f4f4db4..176356d0 100644 --- a/layers/imagick/Dockerfile +++ b/layers/imagick/Dockerfile @@ -32,7 +32,7 @@ WORKDIR ${IMAGICK_BUILD_DIR} RUN curl -Ls -o libheif.tar.gz https://github.com/strukturag/libheif/releases/download/v1.17.5/libheif-1.17.5.tar.gz RUN tar xzf libheif.tar.gz WORKDIR ${IMAGICK_BUILD_DIR}/libheif-1.17.5 -RUN ./configure --prefix ${INSTALL_DIR} --exec-prefix ${INSTALL_DIR} +RUN cmake --preset=release --prefix ${INSTALL_DIR} --exec-prefix ${INSTALL_DIR} RUN make -j $(nproc) RUN make install From cbeef82abfaa3055131aceb4c59310d483b4970f Mon Sep 17 00:00:00 2001 From: Aran Reeks <3313791+aran112000@users.noreply.github.com> Date: Wed, 6 Dec 2023 13:29:07 +0000 Subject: [PATCH 24/27] Attempt to fix libheif compiling --- layers/imagick/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/layers/imagick/Dockerfile b/layers/imagick/Dockerfile index 176356d0..4beee1f4 100644 --- a/layers/imagick/Dockerfile +++ b/layers/imagick/Dockerfile @@ -32,7 +32,7 @@ WORKDIR ${IMAGICK_BUILD_DIR} RUN curl -Ls -o libheif.tar.gz https://github.com/strukturag/libheif/releases/download/v1.17.5/libheif-1.17.5.tar.gz RUN tar xzf libheif.tar.gz WORKDIR ${IMAGICK_BUILD_DIR}/libheif-1.17.5 -RUN cmake --preset=release --prefix ${INSTALL_DIR} --exec-prefix ${INSTALL_DIR} +RUN cmake --preset=release --prefix ${INSTALL_DIR} RUN make -j $(nproc) RUN make install @@ -41,7 +41,7 @@ WORKDIR ${IMAGICK_BUILD_DIR} RUN curl -Ls -o ghostscript.tar.gz https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9561/ghostscript-9.56.1.tar.gz RUN tar xzf ghostscript.tar.gz WORKDIR ${IMAGICK_BUILD_DIR}/ghostscript-9.56.1 -RUN ./configure --prefix ${INSTALL_DIR} --exec-prefix ${INSTALL_DIR} --without-x +RUN ./configure --install-prefix ${INSTALL_DIR} --exec-prefix ${INSTALL_DIR} --without-x RUN make -j $(nproc) RUN cp bin/gs /tmp/gs From 57893f3bf0a7e2898dd8757b612adc123329b36e Mon Sep 17 00:00:00 2001 From: Aran Reeks <3313791+aran112000@users.noreply.github.com> Date: Wed, 6 Dec 2023 13:43:01 +0000 Subject: [PATCH 25/27] More fixes for compiling libheif --- layers/imagick/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/layers/imagick/Dockerfile b/layers/imagick/Dockerfile index 4beee1f4..df974c58 100644 --- a/layers/imagick/Dockerfile +++ b/layers/imagick/Dockerfile @@ -30,9 +30,9 @@ RUN make install # Compile libheif WORKDIR ${IMAGICK_BUILD_DIR} RUN curl -Ls -o libheif.tar.gz https://github.com/strukturag/libheif/releases/download/v1.17.5/libheif-1.17.5.tar.gz -RUN tar xzf libheif.tar.gz -WORKDIR ${IMAGICK_BUILD_DIR}/libheif-1.17.5 -RUN cmake --preset=release --prefix ${INSTALL_DIR} +RUN mkdir ${IMAGICK_BUILD_DIR}/libheif-1.17.5/build +WORKDIR ${IMAGICK_BUILD_DIR}/libheif-1.17.5/build +RUN cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} .. RUN make -j $(nproc) RUN make install @@ -41,7 +41,7 @@ WORKDIR ${IMAGICK_BUILD_DIR} RUN curl -Ls -o ghostscript.tar.gz https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9561/ghostscript-9.56.1.tar.gz RUN tar xzf ghostscript.tar.gz WORKDIR ${IMAGICK_BUILD_DIR}/ghostscript-9.56.1 -RUN ./configure --install-prefix ${INSTALL_DIR} --exec-prefix ${INSTALL_DIR} --without-x +RUN ./configure --prefix ${INSTALL_DIR} --exec-prefix ${INSTALL_DIR} --without-x RUN make -j $(nproc) RUN cp bin/gs /tmp/gs From 401d27702621439123f14daea734b63cf5bb2637 Mon Sep 17 00:00:00 2001 From: Aran Reeks <3313791+aran112000@users.noreply.github.com> Date: Wed, 6 Dec 2023 13:46:31 +0000 Subject: [PATCH 26/27] WIP --- layers/imagick/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layers/imagick/Dockerfile b/layers/imagick/Dockerfile index df974c58..cf67c554 100644 --- a/layers/imagick/Dockerfile +++ b/layers/imagick/Dockerfile @@ -30,7 +30,7 @@ RUN make install # Compile libheif WORKDIR ${IMAGICK_BUILD_DIR} RUN curl -Ls -o libheif.tar.gz https://github.com/strukturag/libheif/releases/download/v1.17.5/libheif-1.17.5.tar.gz -RUN mkdir ${IMAGICK_BUILD_DIR}/libheif-1.17.5/build +RUN mkdir libheif-1.17.5/build WORKDIR ${IMAGICK_BUILD_DIR}/libheif-1.17.5/build RUN cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} .. RUN make -j $(nproc) From c3d91d770bd10a39f638e5e4c6092bf1dbc37673 Mon Sep 17 00:00:00 2001 From: Aran Reeks <3313791+aran112000@users.noreply.github.com> Date: Wed, 6 Dec 2023 13:48:34 +0000 Subject: [PATCH 27/27] WIP --- layers/imagick/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/layers/imagick/Dockerfile b/layers/imagick/Dockerfile index cf67c554..32576203 100644 --- a/layers/imagick/Dockerfile +++ b/layers/imagick/Dockerfile @@ -30,7 +30,8 @@ RUN make install # Compile libheif WORKDIR ${IMAGICK_BUILD_DIR} RUN curl -Ls -o libheif.tar.gz https://github.com/strukturag/libheif/releases/download/v1.17.5/libheif-1.17.5.tar.gz -RUN mkdir libheif-1.17.5/build +RUN tar xzf libheif.tar.gz +RUN mkdir ${IMAGICK_BUILD_DIR}/libheif-1.17.5/build WORKDIR ${IMAGICK_BUILD_DIR}/libheif-1.17.5/build RUN cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} .. RUN make -j $(nproc)