From e0b90e7887a5a00215c6171bfb5b3216ee2654ce Mon Sep 17 00:00:00 2001 From: Michal Hybner Date: Wed, 25 Dec 2024 23:06:13 +0100 Subject: [PATCH 01/13] Build for PHP 8.4 and update libraries --- layers/amqp/Dockerfile | 6 +++--- layers/amqp/config.json | 3 ++- layers/blackfire/config.json | 3 ++- layers/bsdiff/config.json | 3 ++- layers/calendar/config.json | 3 ++- layers/datadog/Dockerfile | 2 +- layers/datadog/config.json | 3 ++- layers/decimal/config.json | 3 ++- layers/ds/config.json | 3 ++- layers/elastic-apm/Dockerfile | 2 +- layers/elastic-apm/config.json | 3 ++- layers/excimer/config.json | 3 ++- layers/gmp/config.json | 3 ++- layers/gnupg/config.json | 3 ++- layers/grpc/Dockerfile | 2 +- layers/grpc/config.json | 3 ++- layers/h3/config.json | 3 ++- layers/igbinary/config.json | 3 ++- layers/imagick/Dockerfile | 16 ++++++++-------- layers/imagick/config.json | 3 ++- layers/imap/config.json | 3 ++- layers/ldap/config.json | 3 ++- layers/mailparse/config.json | 3 ++- layers/maxminddb/Dockerfile | 4 ++-- layers/maxminddb/config.json | 3 ++- layers/memcached/config.json | 3 ++- layers/msgpack/config.json | 3 ++- layers/newrelic/Dockerfile | 2 +- layers/newrelic/config.json | 3 ++- layers/oci8/Dockerfile | 5 +++-- layers/oci8/config.json | 3 ++- layers/odbc-snowflake/Dockerfile | 4 ++-- layers/odbc-snowflake/config.json | 3 ++- layers/opentelemetry/Dockerfile | 2 +- layers/opentelemetry/config.json | 3 ++- layers/pcov/config.json | 3 ++- layers/rdkafka/Dockerfile | 4 ++-- layers/rdkafka/config.json | 3 ++- layers/redis-igbinary/config.json | 3 ++- layers/redis/Dockerfile | 2 +- layers/redis/config.json | 3 ++- layers/relay/Dockerfile | 4 ++-- layers/relay/config.json | 3 ++- layers/scoutapm/config.json | 3 ++- layers/snmp/config.json | 3 ++- layers/ssh2/config.json | 3 ++- layers/swoole/Dockerfile | 2 +- layers/swoole/config.json | 3 ++- layers/symfony-runtime/config.json | 3 ++- layers/tideways/Dockerfile | 2 +- layers/tideways/config.json | 3 ++- layers/tidy/config.json | 3 ++- layers/uuid/config.json | 3 ++- layers/xdebug/config.json | 3 ++- layers/xlswriter/config.json | 3 ++- layers/xmlrpc/config.json | 3 ++- layers/yaml/config.json | 3 ++- 57 files changed, 114 insertions(+), 71 deletions(-) diff --git a/layers/amqp/Dockerfile b/layers/amqp/Dockerfile index cd3b8d33..98e724b2 100644 --- a/layers/amqp/Dockerfile +++ b/layers/amqp/Dockerfile @@ -9,9 +9,9 @@ RUN mkdir -p ${AMQP_BUILD_DIR} # Compile rabbitmq WORKDIR ${AMQP_BUILD_DIR} -RUN curl -Ls -o rabbitmq-c.tar.gz https://github.com/alanxz/rabbitmq-c/archive/refs/tags/v0.13.0.tar.gz +RUN curl -Ls -o rabbitmq-c.tar.gz https://github.com/alanxz/rabbitmq-c/archive/refs/tags/v0.15.0.tar.gz RUN tar xzf rabbitmq-c.tar.gz -WORKDIR ${AMQP_BUILD_DIR}/rabbitmq-c-0.13.0 +WORKDIR ${AMQP_BUILD_DIR}/rabbitmq-c-0.15.0 RUN cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} . RUN cmake --build . --target install @@ -19,7 +19,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 index eea4b0f4..0fc14890 100644 --- 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 index eea4b0f4..0fc14890 100644 --- 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 index eea4b0f4..0fc14890 100644 --- 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 index eea4b0f4..0fc14890 100644 --- 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 index 77fdae8b..b1e1f3e4 100644 --- a/layers/datadog/Dockerfile +++ b/layers/datadog/Dockerfile @@ -7,7 +7,7 @@ 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} diff --git a/layers/datadog/config.json b/layers/datadog/config.json index eea4b0f4..0fc14890 100644 --- 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 index eea4b0f4..0fc14890 100644 --- 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 index eea4b0f4..0fc14890 100644 --- a/layers/ds/config.json +++ b/layers/ds/config.json @@ -3,6 +3,7 @@ "80", "81", "82", - "83" + "83", + "84" ] } diff --git a/layers/elastic-apm/Dockerfile b/layers/elastic-apm/Dockerfile index 2b40d0b7..7328777c 100644 --- a/layers/elastic-apm/Dockerfile +++ b/layers/elastic-apm/Dockerfile @@ -5,7 +5,7 @@ FROM bref/build-php-$PHP_VERSION:$BREF_VERSION AS ext RUN \ LD_LIBRARY_PATH=/lib64:/lib yum install -y libcurl-devel openssl-devel \ && mkdir /tmp/apm \ - && curl -L https://github.com/elastic/apm-agent-php/archive/refs/tags/v1.8.4.tar.gz | tar -C /tmp/apm -zx --strip-components=1 \ + && curl -L https://github.com/elastic/apm-agent-php/archive/refs/tags/v1.14.1.tar.gz | tar -C /tmp/apm -zx --strip-components=1 \ && cd /tmp/apm/src/ext \ && phpize \ && CFLAGS="-std=gnu99" ./configure --enable-elastic_apm \ diff --git a/layers/elastic-apm/config.json b/layers/elastic-apm/config.json index eea4b0f4..0fc14890 100644 --- a/layers/elastic-apm/config.json +++ b/layers/elastic-apm/config.json @@ -3,6 +3,7 @@ "80", "81", "82", - "83" + "83", + "84" ] } diff --git a/layers/excimer/config.json b/layers/excimer/config.json index eea4b0f4..0fc14890 100644 --- 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 index eea4b0f4..0fc14890 100644 --- 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 index 6987cbb1..27864688 100644 --- 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 index 4f800c5a..628fb496 100644 --- 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 index eea4b0f4..0fc14890 100644 --- 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 index eea4b0f4..0fc14890 100644 --- 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 index eea4b0f4..0fc14890 100644 --- a/layers/igbinary/config.json +++ b/layers/igbinary/config.json @@ -3,6 +3,7 @@ "80", "81", "82", - "83" + "83", + "84" ] } diff --git a/layers/imagick/Dockerfile b/layers/imagick/Dockerfile index 7f4f657d..0e0ac7ed 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.4.0.tar.gz +RUN curl -Ls -o libwebp.tar.gz https://github.com/webmproject/libwebp/archive/refs/tags/v1.5.0.tar.gz RUN tar xzf libwebp.tar.gz -WORKDIR ${IMAGICK_BUILD_DIR}/libwebp-1.4.0 +WORKDIR ${IMAGICK_BUILD_DIR}/libwebp-1.5.0 RUN autoreconf -i && automake && autoconf RUN ./configure --prefix ${INSTALL_DIR} --exec-prefix ${INSTALL_DIR} RUN make -j $(nproc) && make install @@ -26,22 +26,22 @@ RUN make -j $(nproc) && 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 && tar xzf libheif.tar.gz -WORKDIR ${IMAGICK_BUILD_DIR}/libheif-1.13.0 +RUN curl -Ls -o libheif.tar.gz https://github.com/strukturag/libheif/releases/download/v1.19.5/libheif-1.13.0.tar.gz && tar xzf libheif.tar.gz +WORKDIR ${IMAGICK_BUILD_DIR}/libheif-1.19.5 RUN ./configure --prefix ${INSTALL_DIR} --exec-prefix ${INSTALL_DIR} RUN make -j $(nproc) && make install # Compile gs 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 && tar xzf ghostscript.tar.gz -WORKDIR ${IMAGICK_BUILD_DIR}/ghostscript-9.56.1 +RUN curl -Ls -o ghostscript.tar.gz https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9561/ghostscript-10.04.0.tar.gz && tar xzf ghostscript.tar.gz +WORKDIR ${IMAGICK_BUILD_DIR}/ghostscript-10.04.0 RUN ./configure --prefix ${INSTALL_DIR} --exec-prefix ${INSTALL_DIR} --without-x RUN make -j $(nproc) && 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-38.tar.gz && tar xzf ImageMagick.tar.gz -WORKDIR ${IMAGICK_BUILD_DIR}/ImageMagick-7.1.1-38 +RUN curl -Ls -o ImageMagick.tar.gz https://github.com/ImageMagick/ImageMagick/archive/refs/tags/7.1.1-43.tar.gz && tar xzf ImageMagick.tar.gz +WORKDIR ${IMAGICK_BUILD_DIR}/ImageMagick-7.1.1-43 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 diff --git a/layers/imagick/config.json b/layers/imagick/config.json index eea4b0f4..0fc14890 100644 --- a/layers/imagick/config.json +++ b/layers/imagick/config.json @@ -3,6 +3,7 @@ "80", "81", "82", - "83" + "83", + "84" ] } diff --git a/layers/imap/config.json b/layers/imap/config.json index eea4b0f4..0fc14890 100644 --- a/layers/imap/config.json +++ b/layers/imap/config.json @@ -3,6 +3,7 @@ "80", "81", "82", - "83" + "83", + "84" ] } diff --git a/layers/ldap/config.json b/layers/ldap/config.json index eea4b0f4..0fc14890 100644 --- 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 index eea4b0f4..0fc14890 100644 --- 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 index f79f856d..3aafaec9 100644 --- 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 index eea4b0f4..0fc14890 100644 --- a/layers/maxminddb/config.json +++ b/layers/maxminddb/config.json @@ -3,6 +3,7 @@ "80", "81", "82", - "83" + "83", + "84" ] } diff --git a/layers/memcached/config.json b/layers/memcached/config.json index eea4b0f4..0fc14890 100644 --- a/layers/memcached/config.json +++ b/layers/memcached/config.json @@ -3,6 +3,7 @@ "80", "81", "82", - "83" + "83", + "84" ] } diff --git a/layers/msgpack/config.json b/layers/msgpack/config.json index eea4b0f4..0fc14890 100644 --- 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 index f930c2fc..38b1ffe4 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=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/newrelic/config.json b/layers/newrelic/config.json index eea4b0f4..0fc14890 100644 --- a/layers/newrelic/config.json +++ b/layers/newrelic/config.json @@ -3,6 +3,7 @@ "80", "81", "82", - "83" + "83", + "84" ] } diff --git a/layers/oci8/Dockerfile b/layers/oci8/Dockerfile index 9e3a6d29..7f6bbc91 100644 --- a/layers/oci8/Dockerfile +++ b/layers/oci8/Dockerfile @@ -10,11 +10,12 @@ 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 && \ + 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 && \ - curl -o oci-sdk.zip https://download.oracle.com/otn_software/linux/instantclient/2110000/instantclient-sdk-linux.x64-21.10.0.0.0dbru.zip && \ + 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 RUN if [ "$PHP_VERSION" = "80" ] ; then \ diff --git a/layers/oci8/config.json b/layers/oci8/config.json index eea4b0f4..0fc14890 100644 --- 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 index 4de3f262..8354d061 100644 --- 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 index eea4b0f4..0fc14890 100644 --- 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 index ad6f63e6..5add6d2d 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.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 index eea4b0f4..0fc14890 100644 --- 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 index eea4b0f4..0fc14890 100644 --- a/layers/pcov/config.json +++ b/layers/pcov/config.json @@ -3,6 +3,7 @@ "80", "81", "82", - "83" + "83", + "84" ] } diff --git a/layers/rdkafka/Dockerfile b/layers/rdkafka/Dockerfile index b0aceaa9..3b1dfaf1 100644 --- a/layers/rdkafka/Dockerfile +++ b/layers/rdkafka/Dockerfile @@ -7,11 +7,11 @@ ENV LIBRDKAFKA_BUILD_DIR=${BUILD_DIR}/librdkafka RUN set -xe; \ mkdir -p ${LIBRDKAFKA_BUILD_DIR}; \ # Download and upack the source code - curl -Ls https://github.com/edenhill/librdkafka/archive/refs/tags/v1.8.2.tar.gz \ + curl -Ls https://github.com/edenhill/librdkafka/archive/refs/tags/v2.6.1.tar.gz \ | tar xzC ${LIBRDKAFKA_BUILD_DIR} # Move into the unpackaged code directory -WORKDIR ${LIBRDKAFKA_BUILD_DIR}/librdkafka-1.8.2/ +WORKDIR ${LIBRDKAFKA_BUILD_DIR}/librdkafka-2.6.1/ # Install RUN set -xe; \ diff --git a/layers/rdkafka/config.json b/layers/rdkafka/config.json index eea4b0f4..0fc14890 100644 --- a/layers/rdkafka/config.json +++ b/layers/rdkafka/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 index eea4b0f4..0fc14890 100644 --- 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 index acc01405..05b0c134 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.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 index eea4b0f4..0fc14890 100644 --- 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 index 5e608350..3f73ae69 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.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 index eea4b0f4..0fc14890 100644 --- 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 index eea4b0f4..0fc14890 100644 --- 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 index 6987cbb1..27864688 100644 --- a/layers/snmp/config.json +++ b/layers/snmp/config.json @@ -2,6 +2,7 @@ "php": [ "81", "82", - "83" + "83", + "84" ] } diff --git a/layers/ssh2/config.json b/layers/ssh2/config.json index eea4b0f4..0fc14890 100644 --- a/layers/ssh2/config.json +++ b/layers/ssh2/config.json @@ -3,6 +3,7 @@ "80", "81", "82", - "83" + "83", + "84" ] } diff --git a/layers/swoole/Dockerfile b/layers/swoole/Dockerfile index 226c35cf..0d7ce903 100644 --- a/layers/swoole/Dockerfile +++ b/layers/swoole/Dockerfile @@ -5,7 +5,7 @@ FROM bref/build-php-$PHP_VERSION:$BREF_VERSION AS ext RUN set -ex && \ LD_LIBRARY_PATH=/lib64:/lib yum install -y libcurl-devel postgresql-devel openssl-devel && \ mkdir ${PHP_BUILD_DIR}/ext/swoole && \ - curl -sfL https://github.com/swoole/swoole-src/archive/v5.1.2.tar.gz -o swoole.tar.gz && \ + curl -sfL https://github.com/swoole/swoole-src/archive/v6.0.0.tar.gz -o swoole.tar.gz && \ tar xfz swoole.tar.gz --strip-components=1 -C ${PHP_BUILD_DIR}/ext/swoole && \ cd ${PHP_BUILD_DIR}/ext/swoole && \ phpize && \ diff --git a/layers/swoole/config.json b/layers/swoole/config.json index eea4b0f4..0fc14890 100644 --- a/layers/swoole/config.json +++ b/layers/swoole/config.json @@ -3,6 +3,7 @@ "80", "81", "82", - "83" + "83", + "84" ] } diff --git a/layers/symfony-runtime/config.json b/layers/symfony-runtime/config.json index eea4b0f4..0fc14890 100644 --- a/layers/symfony-runtime/config.json +++ b/layers/symfony-runtime/config.json @@ -3,6 +3,7 @@ "80", "81", "82", - "83" + "83", + "84" ] } diff --git a/layers/tideways/Dockerfile b/layers/tideways/Dockerfile index b8f860b2..4ac6f73f 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.6.6 +ARG TIDEWAYS_VERSION=5.16.2 # 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 eea4b0f4..0fc14890 100644 --- a/layers/tideways/config.json +++ b/layers/tideways/config.json @@ -3,6 +3,7 @@ "80", "81", "82", - "83" + "83", + "84" ] } diff --git a/layers/tidy/config.json b/layers/tidy/config.json index eea4b0f4..0fc14890 100644 --- a/layers/tidy/config.json +++ b/layers/tidy/config.json @@ -3,6 +3,7 @@ "80", "81", "82", - "83" + "83", + "84" ] } diff --git a/layers/uuid/config.json b/layers/uuid/config.json index eea4b0f4..0fc14890 100644 --- a/layers/uuid/config.json +++ b/layers/uuid/config.json @@ -3,6 +3,7 @@ "80", "81", "82", - "83" + "83", + "84" ] } diff --git a/layers/xdebug/config.json b/layers/xdebug/config.json index eea4b0f4..0fc14890 100644 --- a/layers/xdebug/config.json +++ b/layers/xdebug/config.json @@ -3,6 +3,7 @@ "80", "81", "82", - "83" + "83", + "84" ] } diff --git a/layers/xlswriter/config.json b/layers/xlswriter/config.json index eea4b0f4..0fc14890 100644 --- a/layers/xlswriter/config.json +++ b/layers/xlswriter/config.json @@ -3,6 +3,7 @@ "80", "81", "82", - "83" + "83", + "84" ] } diff --git a/layers/xmlrpc/config.json b/layers/xmlrpc/config.json index eea4b0f4..0fc14890 100644 --- a/layers/xmlrpc/config.json +++ b/layers/xmlrpc/config.json @@ -3,6 +3,7 @@ "80", "81", "82", - "83" + "83", + "84" ] } diff --git a/layers/yaml/config.json b/layers/yaml/config.json index eea4b0f4..0fc14890 100644 --- a/layers/yaml/config.json +++ b/layers/yaml/config.json @@ -3,6 +3,7 @@ "80", "81", "82", - "83" + "83", + "84" ] } From 1f6296c86d3504b67e0f27cc010d123b3292254d Mon Sep 17 00:00:00 2001 From: Michal Hybner Date: Wed, 25 Dec 2024 23:25:12 +0100 Subject: [PATCH 02/13] Update Blackfire action to PHP 8.4 --- .github/workflows/blackfire.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/blackfire.yml b/.github/workflows/blackfire.yml index 0491ee4a..ffb30441 100644 --- 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 From 695748087af4151bc4ddf2ed3ba06238dc00f831 Mon Sep 17 00:00:00 2001 From: Michal Hybner Date: Thu, 26 Dec 2024 12:08:04 +0100 Subject: [PATCH 03/13] amqp: revert rabbitmq-c to 0.13.0 --- layers/amqp/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/layers/amqp/Dockerfile b/layers/amqp/Dockerfile index 98e724b2..91c67444 100644 --- a/layers/amqp/Dockerfile +++ b/layers/amqp/Dockerfile @@ -9,9 +9,11 @@ RUN mkdir -p ${AMQP_BUILD_DIR} # Compile rabbitmq WORKDIR ${AMQP_BUILD_DIR} -RUN curl -Ls -o rabbitmq-c.tar.gz https://github.com/alanxz/rabbitmq-c/archive/refs/tags/v0.15.0.tar.gz +# 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.15.0 +WORKDIR ${AMQP_BUILD_DIR}/rabbitmq-c-0.13.0 RUN cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} . RUN cmake --build . --target install From a21f88988b34019e1cdc24f6bc301fd9fa30afbf Mon Sep 17 00:00:00 2001 From: Michal Hybner Date: Thu, 26 Dec 2024 12:25:46 +0100 Subject: [PATCH 04/13] datadog: take only first path from php-config --ini-dir It returns two paths separated by colon - /opt/bref/etc/php/conf.d:/var/task/php/conf.d --- layers/datadog/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layers/datadog/Dockerfile b/layers/datadog/Dockerfile index b1e1f3e4..f8081553 100644 --- a/layers/datadog/Dockerfile +++ b/layers/datadog/Dockerfile @@ -15,7 +15,7 @@ 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 && \ From c846503a51c0fd8ddfd312755060cd9435899f67 Mon Sep 17 00:00:00 2001 From: Michal Hybner Date: Thu, 26 Dec 2024 12:44:51 +0100 Subject: [PATCH 05/13] elastic-apm: revert completely PHP 8.4 is not supported upstream and fails to compile on updated version --- layers/elastic-apm/Dockerfile | 2 +- layers/elastic-apm/config.json | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/layers/elastic-apm/Dockerfile b/layers/elastic-apm/Dockerfile index 7328777c..2b40d0b7 100644 --- a/layers/elastic-apm/Dockerfile +++ b/layers/elastic-apm/Dockerfile @@ -5,7 +5,7 @@ FROM bref/build-php-$PHP_VERSION:$BREF_VERSION AS ext RUN \ LD_LIBRARY_PATH=/lib64:/lib yum install -y libcurl-devel openssl-devel \ && mkdir /tmp/apm \ - && curl -L https://github.com/elastic/apm-agent-php/archive/refs/tags/v1.14.1.tar.gz | tar -C /tmp/apm -zx --strip-components=1 \ + && curl -L https://github.com/elastic/apm-agent-php/archive/refs/tags/v1.8.4.tar.gz | tar -C /tmp/apm -zx --strip-components=1 \ && cd /tmp/apm/src/ext \ && phpize \ && CFLAGS="-std=gnu99" ./configure --enable-elastic_apm \ diff --git a/layers/elastic-apm/config.json b/layers/elastic-apm/config.json index 0fc14890..eea4b0f4 100644 --- a/layers/elastic-apm/config.json +++ b/layers/elastic-apm/config.json @@ -3,7 +3,6 @@ "80", "81", "82", - "83", - "84" + "83" ] } From ce1f4ff581d29b0d0e03c6c18ae57d7ea958faee Mon Sep 17 00:00:00 2001 From: Michal Hybner Date: Thu, 26 Dec 2024 12:48:37 +0100 Subject: [PATCH 06/13] imagick: revert completely Fails and there is currently open PR for AVIF which makes some changes in build. Better to keep PHP 8.4 upgrade after this PR is merged. --- layers/imagick/Dockerfile | 16 ++++++++-------- layers/imagick/config.json | 3 +-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/layers/imagick/Dockerfile b/layers/imagick/Dockerfile index 0e0ac7ed..7f4f657d 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.5.0.tar.gz +RUN curl -Ls -o libwebp.tar.gz https://github.com/webmproject/libwebp/archive/refs/tags/v1.4.0.tar.gz RUN tar xzf libwebp.tar.gz -WORKDIR ${IMAGICK_BUILD_DIR}/libwebp-1.5.0 +WORKDIR ${IMAGICK_BUILD_DIR}/libwebp-1.4.0 RUN autoreconf -i && automake && autoconf RUN ./configure --prefix ${INSTALL_DIR} --exec-prefix ${INSTALL_DIR} RUN make -j $(nproc) && make install @@ -26,22 +26,22 @@ RUN make -j $(nproc) && make install # Compile libheif WORKDIR ${IMAGICK_BUILD_DIR} -RUN curl -Ls -o libheif.tar.gz https://github.com/strukturag/libheif/releases/download/v1.19.5/libheif-1.13.0.tar.gz && tar xzf libheif.tar.gz -WORKDIR ${IMAGICK_BUILD_DIR}/libheif-1.19.5 +RUN curl -Ls -o libheif.tar.gz https://github.com/strukturag/libheif/releases/download/v1.13.0/libheif-1.13.0.tar.gz && tar xzf libheif.tar.gz +WORKDIR ${IMAGICK_BUILD_DIR}/libheif-1.13.0 RUN ./configure --prefix ${INSTALL_DIR} --exec-prefix ${INSTALL_DIR} RUN make -j $(nproc) && make install # Compile gs WORKDIR ${IMAGICK_BUILD_DIR} -RUN curl -Ls -o ghostscript.tar.gz https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9561/ghostscript-10.04.0.tar.gz && tar xzf ghostscript.tar.gz -WORKDIR ${IMAGICK_BUILD_DIR}/ghostscript-10.04.0 +RUN curl -Ls -o ghostscript.tar.gz https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9561/ghostscript-9.56.1.tar.gz && 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 make -j $(nproc) && 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-43.tar.gz && tar xzf ImageMagick.tar.gz -WORKDIR ${IMAGICK_BUILD_DIR}/ImageMagick-7.1.1-43 +RUN curl -Ls -o ImageMagick.tar.gz https://github.com/ImageMagick/ImageMagick/archive/refs/tags/7.1.1-38.tar.gz && tar xzf ImageMagick.tar.gz +WORKDIR ${IMAGICK_BUILD_DIR}/ImageMagick-7.1.1-38 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 diff --git a/layers/imagick/config.json b/layers/imagick/config.json index 0fc14890..eea4b0f4 100644 --- a/layers/imagick/config.json +++ b/layers/imagick/config.json @@ -3,7 +3,6 @@ "80", "81", "82", - "83", - "84" + "83" ] } From 024b735b20e8b549f16a5b179c5eed3c60082e25 Mon Sep 17 00:00:00 2001 From: Michal Hybner Date: Thu, 26 Dec 2024 12:53:17 +0100 Subject: [PATCH 07/13] imap: revert, moved to PECL, need build rework --- layers/imap/config.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/layers/imap/config.json b/layers/imap/config.json index 0fc14890..eea4b0f4 100644 --- a/layers/imap/config.json +++ b/layers/imap/config.json @@ -3,7 +3,6 @@ "80", "81", "82", - "83", - "84" + "83" ] } From 6512ca78713b25be8bcb5748db77acbf1ac06c35 Mon Sep 17 00:00:00 2001 From: Michal Hybner Date: Thu, 26 Dec 2024 12:55:40 +0100 Subject: [PATCH 08/13] memcached: revert, build fails --- layers/memcached/config.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/layers/memcached/config.json b/layers/memcached/config.json index 0fc14890..eea4b0f4 100644 --- a/layers/memcached/config.json +++ b/layers/memcached/config.json @@ -3,7 +3,6 @@ "80", "81", "82", - "83", - "84" + "83" ] } From b3a2689568bfcc1f94cdb1d4ece62ddc562b56d4 Mon Sep 17 00:00:00 2001 From: Michal Hybner Date: Thu, 26 Dec 2024 12:57:21 +0100 Subject: [PATCH 09/13] newrelic: PHP 8.4 not supported by upstream yet, update library only --- layers/newrelic/config.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/layers/newrelic/config.json b/layers/newrelic/config.json index 0fc14890..eea4b0f4 100644 --- a/layers/newrelic/config.json +++ b/layers/newrelic/config.json @@ -3,7 +3,6 @@ "80", "81", "82", - "83", - "84" + "83" ] } From fd9c6fa9844395cc4bbc10df83f30eb1cd61a1a2 Mon Sep 17 00:00:00 2001 From: Michal Hybner Date: Thu, 26 Dec 2024 13:07:58 +0100 Subject: [PATCH 10/13] oci8: exclude META-INF, fix dir path --- layers/oci8/Dockerfile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/layers/oci8/Dockerfile b/layers/oci8/Dockerfile index 7f6bbc91..28cdc6fd 100644 --- a/layers/oci8/Dockerfile +++ b/layers/oci8/Dockerfile @@ -14,24 +14,24 @@ RUN yum install -y libaio RUN mkdir -p ${ORACLE_BUILD_DIR}; \ cd ${ORACLE_BUILD_DIR}; \ 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 && \ + 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 + 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 From 8555be05a1e47920073c7b45f831635a43b9b1c3 Mon Sep 17 00:00:00 2001 From: Michal Hybner Date: Thu, 26 Dec 2024 13:10:47 +0100 Subject: [PATCH 11/13] rdkafka: revert, build fails after library major version update --- layers/rdkafka/Dockerfile | 4 ++-- layers/rdkafka/config.json | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/layers/rdkafka/Dockerfile b/layers/rdkafka/Dockerfile index 3b1dfaf1..b0aceaa9 100644 --- a/layers/rdkafka/Dockerfile +++ b/layers/rdkafka/Dockerfile @@ -7,11 +7,11 @@ ENV LIBRDKAFKA_BUILD_DIR=${BUILD_DIR}/librdkafka RUN set -xe; \ mkdir -p ${LIBRDKAFKA_BUILD_DIR}; \ # Download and upack the source code - curl -Ls https://github.com/edenhill/librdkafka/archive/refs/tags/v2.6.1.tar.gz \ + curl -Ls https://github.com/edenhill/librdkafka/archive/refs/tags/v1.8.2.tar.gz \ | tar xzC ${LIBRDKAFKA_BUILD_DIR} # Move into the unpackaged code directory -WORKDIR ${LIBRDKAFKA_BUILD_DIR}/librdkafka-2.6.1/ +WORKDIR ${LIBRDKAFKA_BUILD_DIR}/librdkafka-1.8.2/ # Install RUN set -xe; \ diff --git a/layers/rdkafka/config.json b/layers/rdkafka/config.json index 0fc14890..eea4b0f4 100644 --- a/layers/rdkafka/config.json +++ b/layers/rdkafka/config.json @@ -3,7 +3,6 @@ "80", "81", "82", - "83", - "84" + "83" ] } From 756905437cf85062006281ae17134017e3f7fcf2 Mon Sep 17 00:00:00 2001 From: Michal Hybner Date: Thu, 26 Dec 2024 13:12:46 +0100 Subject: [PATCH 12/13] swoole: revert, build of version 6.0.0 fails --- layers/swoole/Dockerfile | 2 +- layers/swoole/config.json | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/layers/swoole/Dockerfile b/layers/swoole/Dockerfile index 0d7ce903..226c35cf 100644 --- a/layers/swoole/Dockerfile +++ b/layers/swoole/Dockerfile @@ -5,7 +5,7 @@ FROM bref/build-php-$PHP_VERSION:$BREF_VERSION AS ext RUN set -ex && \ LD_LIBRARY_PATH=/lib64:/lib yum install -y libcurl-devel postgresql-devel openssl-devel && \ mkdir ${PHP_BUILD_DIR}/ext/swoole && \ - curl -sfL https://github.com/swoole/swoole-src/archive/v6.0.0.tar.gz -o swoole.tar.gz && \ + curl -sfL https://github.com/swoole/swoole-src/archive/v5.1.2.tar.gz -o swoole.tar.gz && \ tar xfz swoole.tar.gz --strip-components=1 -C ${PHP_BUILD_DIR}/ext/swoole && \ cd ${PHP_BUILD_DIR}/ext/swoole && \ phpize && \ diff --git a/layers/swoole/config.json b/layers/swoole/config.json index 0fc14890..eea4b0f4 100644 --- a/layers/swoole/config.json +++ b/layers/swoole/config.json @@ -3,7 +3,6 @@ "80", "81", "82", - "83", - "84" + "83" ] } From 1656f0cd598f5ace3a63d712a7301f80e10ee8d2 Mon Sep 17 00:00:00 2001 From: Michal Hybner Date: Thu, 26 Dec 2024 13:48:42 +0100 Subject: [PATCH 13/13] tideways: strip only 1 component from path Previously tar was packaged with path like ./tideways-5.6.6/, but now it is tideways-php-5.16.2/. --- layers/tideways/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layers/tideways/Dockerfile b/layers/tideways/Dockerfile index 4ac6f73f..c169ceff 100644 --- a/layers/tideways/Dockerfile +++ b/layers/tideways/Dockerfile @@ -11,7 +11,7 @@ RUN <<'END' bash -e mkdir -p /tmp/tideways cd /tmp/tideways export version=$(php -r "echo PHP_MAJOR_VERSION.'.'.PHP_MINOR_VERSION;") - curl -sSL "https://s3-eu-west-1.amazonaws.com/tideways/extension/${TIDEWAYS_VERSION}/tideways-php-${TIDEWAYS_VERSION}-x86_64.tar.gz" | tar -xz --strip-components=2 -C /tmp/tideways + curl -sSL "https://s3-eu-west-1.amazonaws.com/tideways/extension/${TIDEWAYS_VERSION}/tideways-php-${TIDEWAYS_VERSION}-x86_64.tar.gz" | tar -xz --strip-components=1 -C /tmp/tideways cp /tmp/tideways/tideways-php-${version}.so /tmp/tideways.so echo 'extension=tideways.so' > /tmp/ext-tideways.ini END