Merge branch 'master' into prepare-release

# Conflicts: # layers.json
brefphp · Dec 6, 2023 · 9914e49 · 9914e49
2 parents 6c71736 + a94231d
commit 9914e49
Show file tree

Hide file tree

Showing 16 changed files with 70 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Change log
 
+## 1.3.3
+
+- Updated Blackfire to version 1.92.2.
+
+## 1.3.2
+
+- Updated Blackfire to version 1.90.0.
+
+## 1.3.1
+
+- Update PDO sqlsrv to 5.11.1
+
 ## 1.3.0
 
 - Added extension SNMP

diff --git 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}`           |

diff --git a/config.json b/config.json
@@ -1,6 +1,6 @@
 {
     "latest_versions": {
         "v0": "0.12.4",
-        "v1": "1.3.0"
+        "v1": "1.3.2"
     }
 }
diff --git 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.92.2",
+    "81": "1.92.2",
+    "82": "1.92.2"
 }
diff --git a/layers/imagick/Dockerfile b/layers/imagick/Dockerfile
@@ -10,29 +10,30 @@ 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)
 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
-RUN ./configure --prefix ${INSTALL_DIR} --exec-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
 
@@ -47,9 +48,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 +62,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 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}

diff --git a/layers/imagick/config.json b/layers/imagick/config.json
@@ -2,6 +2,7 @@
     "php": [
         "80",
         "81",
-        "82"
+        "82",
+        "83"
     ]
 }
diff --git 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.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 && \

diff --git a/layers/opentelemetry/Dockerfile b/layers/opentelemetry/Dockerfile
@@ -0,0 +1,15 @@
+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 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
@@ -0,0 +1,7 @@
+{
+    "php": [
+        "80",
+        "81",
+        "82"
+    ]
+}
diff --git a/layers/opentelemetry/test.php b/layers/opentelemetry/test.php
@@ -0,0 +1,8 @@
+<?php
+
+if (!function_exists($function = "OpenTelemetry\Instrumentation\hook")) {
+    echo sprintf('FAIL: Function "%s" does not exist.', $function) . PHP_EOL;
+    exit(1);
+}
+
+exit(0);
diff --git 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.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
@@ -2,6 +2,7 @@
     "php": [
         "80",
         "81",
-        "82"
+        "82",
+        "83"
     ]
 }
diff --git 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
@@ -2,6 +2,7 @@
     "php": [
         "80",
         "81",
-        "82"
+        "82",
+        "83"
     ]
 }
diff --git 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
@@ -2,6 +2,7 @@
     "php": [
         "80",
         "81",
-        "82"
+        "82",
+        "83"
     ]
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ @@
         "php": [
             "80",
             "81",
-            "82"
+            "82",
+            "83"
         ]
     }