Merge pull request #578 from mu1f407/php-84

mnapoli · web-flow · commit cea23ab1d230 · 2024-12-26T20:37:58.000+01:00
Build for PHP 8.4 and update libraries
diff --git a/.github/workflows/blackfire.yml b/.github/workflows/blackfire.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Set up PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.4
+          php-version: 8.4
           coverage: none
 
       - name: Checkout code
@@ -26,7 +26,7 @@ jobs:
         id: fetch_version
         run: |
           cd layers/blackfire;
-          for VERSION in 80 81 82; do
+          for VERSION in 80 81 82 83 84; do
             BF_AGENT_VERSION=$(curl -s -o probe -D - https://blackfire.io/api/v1/releases/probe/php/linux/amd64/$VERSION | grep -i 'X-Blackfire-Release-Version: ' | sed "s%X-Blackfire-Release-Version: %%I" | sed s%.$%%);
             php ./store.php $VERSION $BF_AGENT_VERSION;
           done
diff --git a/layers/amqp/Dockerfile b/layers/amqp/Dockerfile
@@ -9,6 +9,8 @@ RUN mkdir -p ${AMQP_BUILD_DIR}
 
 # Compile rabbitmq
 WORKDIR ${AMQP_BUILD_DIR}
+# Currently it is not possible to use newer rabbitmq-c version than 0.13.0 because this is
+# last version which supports CMake 3.17 which is latest available version in Amazon Linux 2.
 RUN curl -Ls -o rabbitmq-c.tar.gz https://github.com/alanxz/rabbitmq-c/archive/refs/tags/v0.13.0.tar.gz
 RUN tar xzf rabbitmq-c.tar.gz
 WORKDIR ${AMQP_BUILD_DIR}/rabbitmq-c-0.13.0
@@ -19,7 +21,7 @@ RUN cmake --build . --target install
 WORKDIR ${AMQP_BUILD_DIR}
 RUN git clone https://github.com/php-amqp/php-amqp
 WORKDIR ${AMQP_BUILD_DIR}/php-amqp
-RUN git reset --hard 618e06ad2ef867598831cdd3faadba0dd65be917
+RUN git checkout v2.1.2
 RUN phpize
 RUN ./configure
 RUN make -j $(nproc)
diff --git a/layers/amqp/config.json b/layers/amqp/config.json
@@ -3,6 +3,7 @@
         "80",
         "81",
         "82",
-        "83"
+        "83",
+        "84"
     ]
 }
diff --git a/layers/blackfire/config.json b/layers/blackfire/config.json
@@ -3,6 +3,7 @@
         "80",
         "81",
         "82",
-        "83"
+        "83",
+        "84"
     ]
 }
diff --git a/layers/bsdiff/config.json b/layers/bsdiff/config.json
@@ -3,6 +3,7 @@
         "80",
         "81",
         "82",
-        "83"
+        "83",
+        "84"
     ]
 }
diff --git a/layers/calendar/config.json b/layers/calendar/config.json
@@ -3,6 +3,7 @@
         "80",
         "81",
         "82",
-        "83"
+        "83",
+        "84"
     ]
 }
diff --git a/layers/datadog/Dockerfile b/layers/datadog/Dockerfile
@@ -7,15 +7,15 @@ ENV DDTRACE_BUILD_DIR=${BUILD_DIR}/ddtrace
 RUN set -xe; \
     mkdir -p ${DDTRACE_BUILD_DIR}; \
     curl -Ls -o ${DDTRACE_BUILD_DIR}/datadog-setup.php \
-      https://github.com/DataDog/dd-trace-php/releases/download/0.96.0/datadog-setup.php
+      https://github.com/DataDog/dd-trace-php/releases/download/1.5.1/datadog-setup.php
 
 WORKDIR ${DDTRACE_BUILD_DIR}
 
 RUN php datadog-setup.php --php-bin=all --enable-profiling
 
 RUN cp "$(php-config --extension-dir)/ddtrace.so" /tmp/ddtrace.so && \
     cp "$(php-config --extension-dir)/datadog-profiling.so" /tmp/datadog-profiling.so && \
-    cp "$(php-config --ini-dir)/98-ddtrace.ini" /tmp/ext.ini
+    cp "$(php-config --ini-dir | cut -d: -f1)/98-ddtrace.ini" /tmp/ext.ini
 
 RUN sed -i 's/extension = ddtrace\.so/extension = \/opt\/bref-extra\/ddtrace.so/' /tmp/ext.ini && \
     sed -i 's/extension = datadog-profiling\.so/extension = \/opt\/bref-extra\/datadog-profiling.so/' /tmp/ext.ini && \
diff --git a/layers/datadog/config.json b/layers/datadog/config.json
@@ -3,6 +3,7 @@
         "80",
         "81",
         "82",
-        "83"
+        "83",
+        "84"
     ]
 }
diff --git a/layers/decimal/config.json b/layers/decimal/config.json
@@ -3,6 +3,7 @@
         "80",
         "81",
         "82",
-        "83"
+        "83",
+        "84"
     ]
 }
diff --git a/layers/ds/config.json b/layers/ds/config.json
@@ -3,6 +3,7 @@
         "80",
         "81",
         "82",
-        "83"
+        "83",
+        "84"
     ]
 }
diff --git a/layers/excimer/config.json b/layers/excimer/config.json
@@ -3,6 +3,7 @@
         "80",
         "81",
         "82",
-        "83"
+        "83",
+        "84"
     ]
 }
diff --git a/layers/gmp/config.json b/layers/gmp/config.json
@@ -3,6 +3,7 @@
         "80",
         "81",
         "82",
-        "83"
+        "83",
+        "84"
     ]
 }
diff --git a/layers/gnupg/config.json b/layers/gnupg/config.json
@@ -2,6 +2,7 @@
     "php": [
         "81",
         "82",
-        "83"
+        "83",
+        "84"
     ]
 }
diff --git a/layers/grpc/Dockerfile b/layers/grpc/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 grpc-1.57.0 > /dev/null
+RUN MAKEFLAGS="-j $(nproc)" && pecl install grpc-1.68.0 > /dev/null
 RUN cp `php-config --extension-dir`/grpc.so /tmp/grpc.so
 RUN strip --strip-debug /tmp/grpc.so
 RUN echo 'extension=grpc.so' > /tmp/ext.ini
diff --git a/layers/grpc/config.json b/layers/grpc/config.json
@@ -3,6 +3,7 @@
         "80",
         "81",
         "82",
-        "83"
+        "83",
+        "84"
     ]
 }
diff --git a/layers/h3/config.json b/layers/h3/config.json
@@ -3,6 +3,7 @@
         "80",
         "81",
         "82",
-        "83"
+        "83",
+        "84"
     ]
 }
diff --git a/layers/igbinary/config.json b/layers/igbinary/config.json
@@ -3,6 +3,7 @@
         "80",
         "81",
         "82",
-        "83"
+        "83",
+        "84"
     ]
 }
diff --git a/layers/ldap/config.json b/layers/ldap/config.json
@@ -3,6 +3,7 @@
         "80",
         "81",
         "82",
-        "83"
+        "83",
+        "84"
     ]
 }
diff --git a/layers/mailparse/config.json b/layers/mailparse/config.json
@@ -3,6 +3,7 @@
         "80",
         "81",
         "82",
-        "83"
+        "83",
+        "84"
     ]
 }
diff --git a/layers/maxminddb/Dockerfile b/layers/maxminddb/Dockerfile
@@ -7,10 +7,10 @@ ARG PHP_VERSION
 ENV LIBMAXMINDDB_BUILD_DIR=${BUILD_DIR}/libmaxminddb
 RUN mkdir -p ${LIBMAXMINDDB_BUILD_DIR}
 
-RUN curl -Ls  https://github.com/maxmind/libmaxminddb/releases/download/1.6.0/libmaxminddb-1.6.0.tar.gz  \
+RUN curl -Ls  https://github.com/maxmind/libmaxminddb/releases/download/1.11.0/libmaxminddb-1.11.0.tar.gz  \
     | tar xzC ${LIBMAXMINDDB_BUILD_DIR}
 
-WORKDIR ${LIBMAXMINDDB_BUILD_DIR}/libmaxminddb-1.6.0
+WORKDIR ${LIBMAXMINDDB_BUILD_DIR}/libmaxminddb-1.11.0
 
 RUN ./configure --prefix ${INSTALL_DIR} --exec-prefix ${INSTALL_DIR}
 RUN make -j `nproc`
diff --git a/layers/maxminddb/config.json b/layers/maxminddb/config.json
@@ -3,6 +3,7 @@
         "80",
         "81",
         "82",
-        "83"
+        "83",
+        "84"
     ]
 }
diff --git a/layers/msgpack/config.json b/layers/msgpack/config.json
@@ -3,6 +3,7 @@
         "80",
         "81",
         "82",
-        "83"
+        "83",
+        "84"
     ]
 }
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=11.3.0.16
+ARG NEWRELIC_VERSION=11.4.0.17
 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/oci8/Dockerfile b/layers/oci8/Dockerfile
@@ -10,27 +10,28 @@ ENV ORACLE_BUILD_DIR=${BUILD_DIR}/oracle
 # Install libaio
 RUN yum install -y libaio
 
+# Instant Client newer than 21.x requires glibc 2.28+ which is not available on Amazon Linux 2
 RUN mkdir -p ${ORACLE_BUILD_DIR}; \
     cd ${ORACLE_BUILD_DIR}; \
-    curl -o oci-basic.zip https://download.oracle.com/otn_software/linux/instantclient/2110000/instantclient-basiclite-linux.x64-21.10.0.0.0dbru.zip && \
-    unzip oci-basic.zip -d src && \
-    curl -o oci-sdk.zip https://download.oracle.com/otn_software/linux/instantclient/2110000/instantclient-sdk-linux.x64-21.10.0.0.0dbru.zip && \
-    unzip oci-sdk.zip -d src
+    curl -o oci-basic.zip https://download.oracle.com/otn_software/linux/instantclient/2116000/instantclient-basiclite-linux.x64-21.16.0.0.0dbru.zip && \
+    unzip oci-basic.zip -d src -x META-INF/* && \
+    curl -o oci-sdk.zip https://download.oracle.com/otn_software/linux/instantclient/2116000/instantclient-sdk-linux.x64-21.16.0.0.0dbru.zip && \
+    unzip oci-sdk.zip -d src -x META-INF/*
 
 RUN if [ "$PHP_VERSION" = "80" ] ; then \
-    echo "instantclient,${ORACLE_BUILD_DIR}/src/instantclient_21_10" | pecl install oci8-3.0.1; \
+    echo "instantclient,${ORACLE_BUILD_DIR}/src/instantclient_21_16" | pecl install oci8-3.0.1; \
     elif [ "$PHP_VERSION" = "81" ] ; then \
-    echo "instantclient,${ORACLE_BUILD_DIR}/src/instantclient_21_10" | pecl install oci8-3.2.1; \
+    echo "instantclient,${ORACLE_BUILD_DIR}/src/instantclient_21_16" | pecl install oci8-3.2.1; \
     else \
-    echo "instantclient,${ORACLE_BUILD_DIR}/src/instantclient_21_10" | pecl install oci8; \
+    echo "instantclient,${ORACLE_BUILD_DIR}/src/instantclient_21_16" | pecl install oci8; \
     fi
 
 RUN cp /usr/lib64/libaio.so.1 /tmp/libaio.so.1
-RUN cp ${ORACLE_BUILD_DIR}/src/instantclient_21_10/libclntshcore.so.21.1 /tmp/libclntshcore.so.21.1
-RUN cp ${ORACLE_BUILD_DIR}/src/instantclient_21_10/libclntsh.so.21.1 /tmp/libclntsh.so.21.1
-RUN cp ${ORACLE_BUILD_DIR}/src/instantclient_21_10/libocci.so.21.1 /tmp/libocci.so.21.1
-RUN cp ${ORACLE_BUILD_DIR}/src/instantclient_21_10/libnnz21.so /tmp/libnnz21.so
-RUN cp ${ORACLE_BUILD_DIR}/src/instantclient_21_10/libociicus.so /tmp/libociicus.so
+RUN cp ${ORACLE_BUILD_DIR}/src/instantclient_21_16/libclntshcore.so.21.1 /tmp/libclntshcore.so.21.1
+RUN cp ${ORACLE_BUILD_DIR}/src/instantclient_21_16/libclntsh.so.21.1 /tmp/libclntsh.so.21.1
+RUN cp ${ORACLE_BUILD_DIR}/src/instantclient_21_16/libocci.so.21.1 /tmp/libocci.so.21.1
+RUN cp ${ORACLE_BUILD_DIR}/src/instantclient_21_16/libnnz21.so /tmp/libnnz21.so
+RUN cp ${ORACLE_BUILD_DIR}/src/instantclient_21_16/libociicus.so /tmp/libociicus.so
 RUN cp `php-config --extension-dir`/oci8.so /tmp/oci8.so
 RUN echo 'extension=oci8.so' > /tmp/ext.ini
 
diff --git a/layers/oci8/config.json b/layers/oci8/config.json
@@ -3,6 +3,7 @@
         "80",
         "81",
         "82",
-        "83"
+        "83",
+        "84"
     ]
 }
diff --git a/layers/odbc-snowflake/Dockerfile b/layers/odbc-snowflake/Dockerfile
@@ -16,9 +16,9 @@ RUN cp `php-config --extension-dir`/odbc.so /tmp/odbc.so
 RUN echo 'extension=odbc.so' > /tmp/ext.ini
 
 # https://docs.snowflake.com/en/user-guide/odbc-download.html
-# https://sfc-repo.snowflakecomputing.com/odbc/linux/2.25.0/index.html
+# https://sfc-repo.snowflakecomputing.com/odbc/linux/3.5.0/index.html
 # also: strip more than 100 mb of debug symbols
-RUN curl https://sfc-repo.snowflakecomputing.com/odbc/linux/2.25.0/snowflake_linux_x8664_odbc-2.25.0.tgz |tar xzv --directory /tmp \
+RUN curl https://sfc-repo.snowflakecomputing.com/odbc/linux/3.5.0/snowflake_linux_x8664_odbc-3.5.0.tgz | tar xzv --directory /tmp \
   && strip -g /tmp/snowflake_odbc/lib/libSnowflake.so
 # modify the config files for the new final location in /opt/snowflake_odbc
 RUN sed -i 's#/path/to/your/#/opt/snowflake_odbc/lib/#g' /tmp/snowflake_odbc/conf/*
diff --git a/layers/odbc-snowflake/config.json b/layers/odbc-snowflake/config.json
@@ -3,6 +3,7 @@
         "80",
         "81",
         "82",
-        "83"
+        "83",
+        "84"
     ]
 }
diff --git 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.1.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
diff --git a/layers/opentelemetry/config.json b/layers/opentelemetry/config.json
@@ -3,6 +3,7 @@
         "80",
         "81",
         "82",
-        "83"
+        "83",
+        "84"
     ]
 }
diff --git a/layers/pcov/config.json b/layers/pcov/config.json
@@ -3,6 +3,7 @@
         "80",
         "81",
         "82",
-        "83"
+        "83",
+        "84"
     ]
 }
diff --git a/layers/redis-igbinary/config.json b/layers/redis-igbinary/config.json
@@ -3,6 +3,7 @@
         "80",
         "81",
         "82",
-        "83"
+        "83",
+        "84"
     ]
 }
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-6.0.2
+RUN pecl install --force redis-6.1.0
 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
@@ -3,6 +3,7 @@
         "80",
         "81",
         "82",
-        "83"
+        "83",
+        "84"
     ]
 }
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.8
+ARG RELAY_VERSION=0.9.1
 
 # Docs: https://relay.so/docs/1.x/installation#manual-installation
 
@@ -15,7 +15,7 @@ RUN pecl install igbinary msgpack && \
     echo 'extension=msgpack.so' > /tmp/ext-msgpack.ini
 
 # Install system dependencies needed by Relay
-ARG ZSTD_VERSION=1.5.2
+ARG ZSTD_VERSION=1.5.6
 RUN <<'END' bash -e
     mkdir -p /tmp/zstd
     cd /tmp/zstd
diff --git a/layers/relay/config.json b/layers/relay/config.json
@@ -3,6 +3,7 @@
         "80",
         "81",
         "82",
-        "83"
+        "83",
+        "84"
     ]
 }
diff --git a/layers/scoutapm/config.json b/layers/scoutapm/config.json
@@ -3,6 +3,7 @@
         "80",
         "81",
         "82",
-        "83"
+        "83",
+        "84"
     ]
 }
diff --git a/layers/snmp/config.json b/layers/snmp/config.json
diff --git a/layers/ssh2/config.json b/layers/ssh2/config.json
diff --git a/layers/symfony-runtime/config.json b/layers/symfony-runtime/config.json
diff --git a/layers/tideways/Dockerfile b/layers/tideways/Dockerfile
diff --git a/layers/tideways/config.json b/layers/tideways/config.json
diff --git a/layers/tidy/config.json b/layers/tidy/config.json
diff --git a/layers/uuid/config.json b/layers/uuid/config.json
diff --git a/layers/xdebug/config.json b/layers/xdebug/config.json
diff --git a/layers/xlswriter/config.json b/layers/xlswriter/config.json
diff --git a/layers/xmlrpc/config.json b/layers/xmlrpc/config.json
diff --git a/layers/yaml/config.json b/layers/yaml/config.json

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`"80",`
`4`	`4`	`"81",`
`5`	`5`	`"82",`
`6`		`- "83"`
	`6`	`+ "83",`
	`7`	`+ "84"`
`7`	`8`	`]`
`8`	`9`	`}`