From 9ee021e496e88fc117b7e32ae70f3da4f08bf827 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20HOUZ=C3=89?= Date: Mon, 30 Aug 2021 00:59:06 +0200 Subject: [PATCH 1/3] Adding php 81 for most extensions Related to https://github.com/brefphp/bref/pull/1007 Also related to https://github.com/brefphp/bref/pull/1008, waiting for upfix to be merged --- CHANGELOG.md | 23 +++++++++++++++++++++++ composer.json | 2 +- layers/amqp/Dockerfile | 2 +- layers/blackfire/Dockerfile | 2 +- layers/calendar/Dockerfile | 2 +- layers/calendar/config.json | 3 ++- layers/cassandra/Dockerfile | 2 +- layers/ds/Dockerfile | 2 +- layers/gd/Dockerfile | 2 +- layers/gd/config.json | 3 ++- layers/gmp/Dockerfile | 2 +- layers/gmp/config.json | 3 ++- layers/grpc/Dockerfile | 2 +- layers/grpc/config.json | 3 ++- layers/igbinary/Dockerfile | 2 +- layers/igbinary/config.json | 3 ++- layers/imagick/Dockerfile | 2 +- layers/imap/Dockerfile | 2 +- layers/imap/config.json | 3 ++- layers/ldap/Dockerfile | 2 +- layers/ldap/config.json | 3 ++- layers/mailparse/Dockerfile | 2 +- layers/memcache/Dockerfile | 2 +- layers/memcached/Dockerfile | 2 +- layers/memcached/config.json | 3 ++- layers/mongodb/Dockerfile | 2 +- layers/msgpack/Dockerfile | 2 +- layers/msgpack/config.json | 3 ++- layers/newrelic/Dockerfile | 2 +- layers/odbc-snowflake/Dockerfile | 2 +- layers/odbc-snowflake/config.json | 3 ++- layers/pcov/Dockerfile | 2 +- layers/pcov/config.json | 3 ++- layers/pgsql/Dockerfile | 2 +- layers/pgsql/config.json | 3 ++- layers/rdkafka/Dockerfile | 2 +- layers/redis/Dockerfile | 2 +- layers/redis/config.json | 3 ++- layers/scrypt/Dockerfile | 2 +- layers/spx/Dockerfile | 2 +- layers/sqlsrv/Dockerfile | 4 ++-- layers/uuid/Dockerfile | 2 +- layers/uuid/config.json | 3 ++- layers/xdebug/Dockerfile | 2 +- layers/yaml/Dockerfile | 2 +- tests/Dockerfile | 2 +- 46 files changed, 83 insertions(+), 46 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7cc04062..2c3e9156 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,28 @@ # Change log +## 0.12.0 + +### Changed + +- Using bref/build-php-XX:1.2.12 as base image + +### Added + +- Support for Calendar on PHP 8.1. +- Support for GD on PHP 8.1. +- Support for GMP on PHP 8.1. +- Support for gRPC on PHP 8.1. +- Support for Igbinary on PHP 8.1. +- Support for Imap on PHP 8.1. +- Support for LDAP on PHP 8.1. +- Support for Memcached on PHP 8.1. +- Support for msgpack on PHP 8.1. +- Support for ODBC Snowflake on PHP 8.1. +- Support for pcov on PHP 8.1. +- Support for pgsql on PHP 8.1. +- Support for Redis on PHP 8.1. +- Support for UUID on PHP 8.1. + ## 0.11.14 ### Added diff --git a/composer.json b/composer.json index 24d772ac..751efeef 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ } }, "conflict": { - "bref/bref": "<1.1.4" + "bref/bref": "<1.2.12" }, "license": "MIT", "authors": [ diff --git a/layers/amqp/Dockerfile b/layers/amqp/Dockerfile index e8a8b59b..accb5cc1 100644 --- a/layers/amqp/Dockerfile +++ b/layers/amqp/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.1.4 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext ARG PHP_VERSION ENV LIBRABBITMQ_BUILD_DIR=${BUILD_DIR}/librabbitmq diff --git a/layers/blackfire/Dockerfile b/layers/blackfire/Dockerfile index 9fb085f2..02f01d2d 100644 --- a/layers/blackfire/Dockerfile +++ b/layers/blackfire/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.1.4 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext RUN version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \ && curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire.io/api/v1/releases/probe/php/linux/amd64/$version \ diff --git a/layers/calendar/Dockerfile b/layers/calendar/Dockerfile index 89c46fd4..8faae149 100644 --- a/layers/calendar/Dockerfile +++ b/layers/calendar/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.1.4 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext WORKDIR ${PHP_BUILD_DIR}/ext/calendar RUN phpize && \ diff --git a/layers/calendar/config.json b/layers/calendar/config.json index 6abe3e86..b12fe90c 100644 --- a/layers/calendar/config.json +++ b/layers/calendar/config.json @@ -2,6 +2,7 @@ "php": [ "73", "74", - "80" + "80", + "81" ] } diff --git a/layers/cassandra/Dockerfile b/layers/cassandra/Dockerfile index 01437ac3..f9a55a71 100755 --- a/layers/cassandra/Dockerfile +++ b/layers/cassandra/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.1.4 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext # Datastax is providing a PHP Cassandra driver, but this hasn't been updated for a while and doesn't work with PHP 7.2 or higher # Datastax indicated there will be updates in the near future, so check https://docs.datastax.com/en/developer/php-driver/ if you want to avoid building your own :-) diff --git a/layers/ds/Dockerfile b/layers/ds/Dockerfile index fe476a1c..f5da95bd 100755 --- a/layers/ds/Dockerfile +++ b/layers/ds/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.1.4 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext RUN pecl install ds RUN cp `php-config --extension-dir`/ds.so /tmp/ds.so diff --git a/layers/gd/Dockerfile b/layers/gd/Dockerfile index 452b803b..86736eec 100644 --- a/layers/gd/Dockerfile +++ b/layers/gd/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.1.4 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext # Install required build libraries RUN set -ue \ diff --git a/layers/gd/config.json b/layers/gd/config.json index 6abe3e86..b12fe90c 100644 --- a/layers/gd/config.json +++ b/layers/gd/config.json @@ -2,6 +2,7 @@ "php": [ "73", "74", - "80" + "80", + "81" ] } diff --git a/layers/gmp/Dockerfile b/layers/gmp/Dockerfile index 488f614d..3e13ecaf 100644 --- a/layers/gmp/Dockerfile +++ b/layers/gmp/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.1.4 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext # Fix library path ENV LD_LIBRARY_PATH=/usr/lib:/usr/lib64:$LD_LIBRARY_PATH diff --git a/layers/gmp/config.json b/layers/gmp/config.json index 6abe3e86..b12fe90c 100644 --- a/layers/gmp/config.json +++ b/layers/gmp/config.json @@ -2,6 +2,7 @@ "php": [ "73", "74", - "80" + "80", + "81" ] } diff --git a/layers/grpc/Dockerfile b/layers/grpc/Dockerfile index 10f5b72e..be030c62 100644 --- a/layers/grpc/Dockerfile +++ b/layers/grpc/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.1.4 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext RUN pecl install grpc > /dev/null RUN cp `php-config --extension-dir`/grpc.so /tmp/grpc.so diff --git a/layers/grpc/config.json b/layers/grpc/config.json index 6abe3e86..b12fe90c 100644 --- a/layers/grpc/config.json +++ b/layers/grpc/config.json @@ -2,6 +2,7 @@ "php": [ "73", "74", - "80" + "80", + "81" ] } diff --git a/layers/igbinary/Dockerfile b/layers/igbinary/Dockerfile index 354b7cd6..9fb8690a 100644 --- a/layers/igbinary/Dockerfile +++ b/layers/igbinary/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.1.4 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext RUN pecl install igbinary RUN cp `php-config --extension-dir`/igbinary.so /tmp/igbinary.so diff --git a/layers/igbinary/config.json b/layers/igbinary/config.json index 6abe3e86..b12fe90c 100644 --- a/layers/igbinary/config.json +++ b/layers/igbinary/config.json @@ -2,6 +2,7 @@ "php": [ "73", "74", - "80" + "80", + "81" ] } diff --git a/layers/imagick/Dockerfile b/layers/imagick/Dockerfile index 2536caef..39871de4 100644 --- a/layers/imagick/Dockerfile +++ b/layers/imagick/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.1.4 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext ARG PHP_VERSION # Prepare environment diff --git a/layers/imap/Dockerfile b/layers/imap/Dockerfile index ea0ba9d6..878a4665 100644 --- a/layers/imap/Dockerfile +++ b/layers/imap/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.1.4 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext RUN LD_LIBRARY_PATH=/lib:/lib64 yum -y install amazon-linux-extras RUN LD_LIBRARY_PATH=/lib:/lib64 amazon-linux-extras install epel -y diff --git a/layers/imap/config.json b/layers/imap/config.json index 72bd4d03..4ec1e755 100644 --- a/layers/imap/config.json +++ b/layers/imap/config.json @@ -1,6 +1,7 @@ { "php": [ "73", - "74" + "74", + "81" ] } diff --git a/layers/ldap/Dockerfile b/layers/ldap/Dockerfile index f1d5d50b..2a9ede27 100644 --- a/layers/ldap/Dockerfile +++ b/layers/ldap/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.1.4 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext ENV LD_LIBRARY_PATH=/usr/lib:/usr/lib64:$LD_LIBRARY_PATH diff --git a/layers/ldap/config.json b/layers/ldap/config.json index 6abe3e86..b12fe90c 100644 --- a/layers/ldap/config.json +++ b/layers/ldap/config.json @@ -2,6 +2,7 @@ "php": [ "73", "74", - "80" + "80", + "81" ] } diff --git a/layers/mailparse/Dockerfile b/layers/mailparse/Dockerfile index 281e16c7..a0278803 100644 --- a/layers/mailparse/Dockerfile +++ b/layers/mailparse/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.1.4 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext ENV LD_LIBRARY_PATH=/usr/lib:/usr/lib64:$LD_LIBRARY_PATH RUN yum install -y re2c diff --git a/layers/memcache/Dockerfile b/layers/memcache/Dockerfile index 7b553eeb..1fdfcbdd 100644 --- a/layers/memcache/Dockerfile +++ b/layers/memcache/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.1.4 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext ARG PHP_VERSION ENV LIBMEMCACHED_BUILD_DIR=${BUILD_DIR}/libmemcached diff --git a/layers/memcached/Dockerfile b/layers/memcached/Dockerfile index e250a85e..6764919d 100644 --- a/layers/memcached/Dockerfile +++ b/layers/memcached/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.1.4 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext ENV LIBMEMCACHED_BUILD_DIR=${BUILD_DIR}/libmemcached diff --git a/layers/memcached/config.json b/layers/memcached/config.json index 72bd4d03..4ec1e755 100644 --- a/layers/memcached/config.json +++ b/layers/memcached/config.json @@ -1,6 +1,7 @@ { "php": [ "73", - "74" + "74", + "81" ] } diff --git a/layers/mongodb/Dockerfile b/layers/mongodb/Dockerfile index a9b5c359..48ecccdf 100644 --- a/layers/mongodb/Dockerfile +++ b/layers/mongodb/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.1.4 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext RUN pecl install --force mongodb RUN cp `php-config --extension-dir`/mongodb.so /tmp/mongodb.so diff --git a/layers/msgpack/Dockerfile b/layers/msgpack/Dockerfile index 50ce6f56..6bae5182 100644 --- a/layers/msgpack/Dockerfile +++ b/layers/msgpack/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.1.4 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext RUN pecl install msgpack RUN cp `php-config --extension-dir`/msgpack.so /tmp/msgpack.so diff --git a/layers/msgpack/config.json b/layers/msgpack/config.json index 6abe3e86..b12fe90c 100644 --- a/layers/msgpack/config.json +++ b/layers/msgpack/config.json @@ -2,6 +2,7 @@ "php": [ "73", "74", - "80" + "80", + "81" ] } diff --git a/layers/newrelic/Dockerfile b/layers/newrelic/Dockerfile index 969ad7bb..c7aac059 100644 --- a/layers/newrelic/Dockerfile +++ b/layers/newrelic/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.1.4 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext # Build the New Relic Agent install silently for PHP Agent 9.17 diff --git a/layers/odbc-snowflake/Dockerfile b/layers/odbc-snowflake/Dockerfile index fe987b01..4d205036 100644 --- a/layers/odbc-snowflake/Dockerfile +++ b/layers/odbc-snowflake/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.1.4 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext ENV LD_LIBRARY_PATH=/usr/lib:/usr/lib64:$LD_LIBRARY_PATH RUN yum install -y unixODBC unixODBC-devel diff --git a/layers/odbc-snowflake/config.json b/layers/odbc-snowflake/config.json index 6abe3e86..b12fe90c 100644 --- a/layers/odbc-snowflake/config.json +++ b/layers/odbc-snowflake/config.json @@ -2,6 +2,7 @@ "php": [ "73", "74", - "80" + "80", + "81" ] } diff --git a/layers/pcov/Dockerfile b/layers/pcov/Dockerfile index 53d2a826..b36c7ece 100644 --- a/layers/pcov/Dockerfile +++ b/layers/pcov/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.1.4 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext RUN pecl install pcov RUN cp `php-config --extension-dir`/pcov.so /tmp/pcov.so diff --git a/layers/pcov/config.json b/layers/pcov/config.json index 6abe3e86..b12fe90c 100644 --- a/layers/pcov/config.json +++ b/layers/pcov/config.json @@ -2,6 +2,7 @@ "php": [ "73", "74", - "80" + "80", + "81" ] } diff --git a/layers/pgsql/Dockerfile b/layers/pgsql/Dockerfile index ec40df77..192be299 100644 --- a/layers/pgsql/Dockerfile +++ b/layers/pgsql/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.1.4 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext WORKDIR ${PHP_BUILD_DIR}/ext/pgsql RUN phpize diff --git a/layers/pgsql/config.json b/layers/pgsql/config.json index 6abe3e86..b12fe90c 100644 --- a/layers/pgsql/config.json +++ b/layers/pgsql/config.json @@ -2,6 +2,7 @@ "php": [ "73", "74", - "80" + "80", + "81" ] } diff --git a/layers/rdkafka/Dockerfile b/layers/rdkafka/Dockerfile index a143d2fc..37360e89 100644 --- a/layers/rdkafka/Dockerfile +++ b/layers/rdkafka/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.1.4 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext ENV LIBRDKAFKA_BUILD_DIR=${BUILD_DIR}/librdkafka diff --git a/layers/redis/Dockerfile b/layers/redis/Dockerfile index 4d14a95e..f6922c6c 100644 --- a/layers/redis/Dockerfile +++ b/layers/redis/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.1.4 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext RUN pecl install --force redis RUN cp `php-config --extension-dir`/redis.so /tmp/redis.so diff --git a/layers/redis/config.json b/layers/redis/config.json index 6abe3e86..b12fe90c 100644 --- a/layers/redis/config.json +++ b/layers/redis/config.json @@ -2,6 +2,7 @@ "php": [ "73", "74", - "80" + "80", + "81" ] } diff --git a/layers/scrypt/Dockerfile b/layers/scrypt/Dockerfile index 45944704..db047988 100644 --- a/layers/scrypt/Dockerfile +++ b/layers/scrypt/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.1.4 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext RUN pecl install scrypt RUN cp `php-config --extension-dir`/scrypt.so /tmp/scrypt.so diff --git a/layers/spx/Dockerfile b/layers/spx/Dockerfile index b42dda4b..c089d865 100644 --- a/layers/spx/Dockerfile +++ b/layers/spx/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.1.4 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext RUN git clone https://github.com/NoiseByNorthwest/php-spx.git \ && cd php-spx \ diff --git a/layers/sqlsrv/Dockerfile b/layers/sqlsrv/Dockerfile index d4895163..7ea9bad0 100644 --- a/layers/sqlsrv/Dockerfile +++ b/layers/sqlsrv/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.1.4 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext ENV LD_LIBRARY_PATH=/usr/lib:/usr/lib64:$LD_LIBRARY_PATH @@ -15,7 +15,7 @@ RUN cp /opt/bref/lib/php/extensions/no-debug-non-zts-*/sqlsrv.so /tmp/sqlsrv.so RUN cp /opt/bref/lib/php/extensions/no-debug-non-zts-*/pdo_sqlsrv.so /tmp/pdo_sqlsrv.so RUN echo $'extension=/opt/bref-extra/sqlsrv.so\n\ -extension=/opt/bref-extra/pdo_sqlsrv.so' > /tmp/ext.ini + extension=/opt/bref-extra/pdo_sqlsrv.so' > /tmp/ext.ini FROM scratch diff --git a/layers/uuid/Dockerfile b/layers/uuid/Dockerfile index ae590be0..bf406584 100644 --- a/layers/uuid/Dockerfile +++ b/layers/uuid/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.1.4 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext ENV LD_LIBRARY_PATH=/usr/lib:/usr/lib64:$LD_LIBRARY_PATH diff --git a/layers/uuid/config.json b/layers/uuid/config.json index 6abe3e86..b12fe90c 100644 --- a/layers/uuid/config.json +++ b/layers/uuid/config.json @@ -2,6 +2,7 @@ "php": [ "73", "74", - "80" + "80", + "81" ] } diff --git a/layers/xdebug/Dockerfile b/layers/xdebug/Dockerfile index 7d456fef..44abc6c2 100644 --- a/layers/xdebug/Dockerfile +++ b/layers/xdebug/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.1.4 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext RUN pecl install xdebug RUN cp `php-config --extension-dir`/xdebug.so /tmp/xdebug.so diff --git a/layers/yaml/Dockerfile b/layers/yaml/Dockerfile index 3cfcb62e..d2963fb0 100644 --- a/layers/yaml/Dockerfile +++ b/layers/yaml/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.1.4 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext ENV LIBYAML_BUILD_DIR=${BUILD_DIR}/libyaml diff --git a/tests/Dockerfile b/tests/Dockerfile index f0ce02db..e4c9e45d 100644 --- a/tests/Dockerfile +++ b/tests/Dockerfile @@ -2,6 +2,6 @@ ARG PHP_VERSION ARG TARGET_IMAGE FROM bref/$TARGET_IMAGE AS ext -FROM bref/php-$PHP_VERSION:1.1.4 +FROM bref/php-$PHP_VERSION:1.2.12 COPY --from=ext /opt /opt From 46d738c73307857b20b17b2f3ab7d6b237d7afb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20HOUZ=C3=89?= Date: Mon, 30 Aug 2021 17:31:38 +0200 Subject: [PATCH 2/3] Use 1.2.13 as base bref image --- CHANGELOG.md | 2 +- composer.json | 2 +- layers/amqp/Dockerfile | 2 +- layers/blackfire/Dockerfile | 2 +- layers/calendar/Dockerfile | 2 +- layers/cassandra/Dockerfile | 2 +- layers/ds/Dockerfile | 2 +- layers/gd/Dockerfile | 2 +- layers/gmp/Dockerfile | 2 +- layers/grpc/Dockerfile | 2 +- layers/igbinary/Dockerfile | 2 +- layers/imagick/Dockerfile | 2 +- layers/imap/Dockerfile | 2 +- layers/ldap/Dockerfile | 2 +- layers/mailparse/Dockerfile | 2 +- layers/memcache/Dockerfile | 2 +- layers/memcached/Dockerfile | 2 +- layers/mongodb/Dockerfile | 2 +- layers/msgpack/Dockerfile | 2 +- layers/newrelic/Dockerfile | 2 +- layers/odbc-snowflake/Dockerfile | 2 +- layers/pcov/Dockerfile | 2 +- layers/pgsql/Dockerfile | 2 +- layers/rdkafka/Dockerfile | 2 +- layers/redis/Dockerfile | 2 +- layers/scrypt/Dockerfile | 2 +- layers/spx/Dockerfile | 2 +- layers/sqlsrv/Dockerfile | 2 +- layers/uuid/Dockerfile | 2 +- layers/xdebug/Dockerfile | 2 +- layers/yaml/Dockerfile | 2 +- tests/Dockerfile | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c3e9156..f8fea5f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ ### Changed -- Using bref/build-php-XX:1.2.12 as base image +- Using bref/build-php-XX:1.2.13 as base image ### Added diff --git a/composer.json b/composer.json index 751efeef..4127e39b 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ } }, "conflict": { - "bref/bref": "<1.2.12" + "bref/bref": "<1.2.13" }, "license": "MIT", "authors": [ diff --git a/layers/amqp/Dockerfile b/layers/amqp/Dockerfile index accb5cc1..bb1191e5 100644 --- a/layers/amqp/Dockerfile +++ b/layers/amqp/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.13 AS ext ARG PHP_VERSION ENV LIBRABBITMQ_BUILD_DIR=${BUILD_DIR}/librabbitmq diff --git a/layers/blackfire/Dockerfile b/layers/blackfire/Dockerfile index 02f01d2d..14019970 100644 --- a/layers/blackfire/Dockerfile +++ b/layers/blackfire/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.13 AS ext RUN version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \ && curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire.io/api/v1/releases/probe/php/linux/amd64/$version \ diff --git a/layers/calendar/Dockerfile b/layers/calendar/Dockerfile index 8faae149..40e01ad9 100644 --- a/layers/calendar/Dockerfile +++ b/layers/calendar/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.13 AS ext WORKDIR ${PHP_BUILD_DIR}/ext/calendar RUN phpize && \ diff --git a/layers/cassandra/Dockerfile b/layers/cassandra/Dockerfile index f9a55a71..d9ec9c12 100755 --- a/layers/cassandra/Dockerfile +++ b/layers/cassandra/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.13 AS ext # Datastax is providing a PHP Cassandra driver, but this hasn't been updated for a while and doesn't work with PHP 7.2 or higher # Datastax indicated there will be updates in the near future, so check https://docs.datastax.com/en/developer/php-driver/ if you want to avoid building your own :-) diff --git a/layers/ds/Dockerfile b/layers/ds/Dockerfile index f5da95bd..51c42286 100755 --- a/layers/ds/Dockerfile +++ b/layers/ds/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.13 AS ext RUN pecl install ds RUN cp `php-config --extension-dir`/ds.so /tmp/ds.so diff --git a/layers/gd/Dockerfile b/layers/gd/Dockerfile index 86736eec..1256e4f0 100644 --- a/layers/gd/Dockerfile +++ b/layers/gd/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.13 AS ext # Install required build libraries RUN set -ue \ diff --git a/layers/gmp/Dockerfile b/layers/gmp/Dockerfile index 3e13ecaf..bc8bd7f5 100644 --- a/layers/gmp/Dockerfile +++ b/layers/gmp/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.13 AS ext # Fix library path ENV LD_LIBRARY_PATH=/usr/lib:/usr/lib64:$LD_LIBRARY_PATH diff --git a/layers/grpc/Dockerfile b/layers/grpc/Dockerfile index be030c62..a204bb94 100644 --- a/layers/grpc/Dockerfile +++ b/layers/grpc/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.13 AS ext RUN pecl install grpc > /dev/null RUN cp `php-config --extension-dir`/grpc.so /tmp/grpc.so diff --git a/layers/igbinary/Dockerfile b/layers/igbinary/Dockerfile index 9fb8690a..66b06653 100644 --- a/layers/igbinary/Dockerfile +++ b/layers/igbinary/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.13 AS ext RUN pecl install igbinary RUN cp `php-config --extension-dir`/igbinary.so /tmp/igbinary.so diff --git a/layers/imagick/Dockerfile b/layers/imagick/Dockerfile index 39871de4..b44ece4e 100644 --- a/layers/imagick/Dockerfile +++ b/layers/imagick/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.13 AS ext ARG PHP_VERSION # Prepare environment diff --git a/layers/imap/Dockerfile b/layers/imap/Dockerfile index 878a4665..0ef04cb9 100644 --- a/layers/imap/Dockerfile +++ b/layers/imap/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.13 AS ext RUN LD_LIBRARY_PATH=/lib:/lib64 yum -y install amazon-linux-extras RUN LD_LIBRARY_PATH=/lib:/lib64 amazon-linux-extras install epel -y diff --git a/layers/ldap/Dockerfile b/layers/ldap/Dockerfile index 2a9ede27..b1ad2bb6 100644 --- a/layers/ldap/Dockerfile +++ b/layers/ldap/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.13 AS ext ENV LD_LIBRARY_PATH=/usr/lib:/usr/lib64:$LD_LIBRARY_PATH diff --git a/layers/mailparse/Dockerfile b/layers/mailparse/Dockerfile index a0278803..9e84c8d2 100644 --- a/layers/mailparse/Dockerfile +++ b/layers/mailparse/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.13 AS ext ENV LD_LIBRARY_PATH=/usr/lib:/usr/lib64:$LD_LIBRARY_PATH RUN yum install -y re2c diff --git a/layers/memcache/Dockerfile b/layers/memcache/Dockerfile index 1fdfcbdd..4931e6e3 100644 --- a/layers/memcache/Dockerfile +++ b/layers/memcache/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.13 AS ext ARG PHP_VERSION ENV LIBMEMCACHED_BUILD_DIR=${BUILD_DIR}/libmemcached diff --git a/layers/memcached/Dockerfile b/layers/memcached/Dockerfile index 6764919d..863aa558 100644 --- a/layers/memcached/Dockerfile +++ b/layers/memcached/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.13 AS ext ENV LIBMEMCACHED_BUILD_DIR=${BUILD_DIR}/libmemcached diff --git a/layers/mongodb/Dockerfile b/layers/mongodb/Dockerfile index 48ecccdf..40c42634 100644 --- a/layers/mongodb/Dockerfile +++ b/layers/mongodb/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.13 AS ext RUN pecl install --force mongodb RUN cp `php-config --extension-dir`/mongodb.so /tmp/mongodb.so diff --git a/layers/msgpack/Dockerfile b/layers/msgpack/Dockerfile index 6bae5182..0f976531 100644 --- a/layers/msgpack/Dockerfile +++ b/layers/msgpack/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.13 AS ext RUN pecl install msgpack RUN cp `php-config --extension-dir`/msgpack.so /tmp/msgpack.so diff --git a/layers/newrelic/Dockerfile b/layers/newrelic/Dockerfile index c7aac059..b04ec0bd 100644 --- a/layers/newrelic/Dockerfile +++ b/layers/newrelic/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.13 AS ext # Build the New Relic Agent install silently for PHP Agent 9.17 diff --git a/layers/odbc-snowflake/Dockerfile b/layers/odbc-snowflake/Dockerfile index 4d205036..59e9dc33 100644 --- a/layers/odbc-snowflake/Dockerfile +++ b/layers/odbc-snowflake/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.13 AS ext ENV LD_LIBRARY_PATH=/usr/lib:/usr/lib64:$LD_LIBRARY_PATH RUN yum install -y unixODBC unixODBC-devel diff --git a/layers/pcov/Dockerfile b/layers/pcov/Dockerfile index b36c7ece..fc0087f6 100644 --- a/layers/pcov/Dockerfile +++ b/layers/pcov/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.13 AS ext RUN pecl install pcov RUN cp `php-config --extension-dir`/pcov.so /tmp/pcov.so diff --git a/layers/pgsql/Dockerfile b/layers/pgsql/Dockerfile index 192be299..4717a5a6 100644 --- a/layers/pgsql/Dockerfile +++ b/layers/pgsql/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.13 AS ext WORKDIR ${PHP_BUILD_DIR}/ext/pgsql RUN phpize diff --git a/layers/rdkafka/Dockerfile b/layers/rdkafka/Dockerfile index 37360e89..a0e881fa 100644 --- a/layers/rdkafka/Dockerfile +++ b/layers/rdkafka/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.13 AS ext ENV LIBRDKAFKA_BUILD_DIR=${BUILD_DIR}/librdkafka diff --git a/layers/redis/Dockerfile b/layers/redis/Dockerfile index f6922c6c..37118783 100644 --- a/layers/redis/Dockerfile +++ b/layers/redis/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.13 AS ext RUN pecl install --force redis RUN cp `php-config --extension-dir`/redis.so /tmp/redis.so diff --git a/layers/scrypt/Dockerfile b/layers/scrypt/Dockerfile index db047988..ea2aa1fc 100644 --- a/layers/scrypt/Dockerfile +++ b/layers/scrypt/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.13 AS ext RUN pecl install scrypt RUN cp `php-config --extension-dir`/scrypt.so /tmp/scrypt.so diff --git a/layers/spx/Dockerfile b/layers/spx/Dockerfile index c089d865..563fd38a 100644 --- a/layers/spx/Dockerfile +++ b/layers/spx/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.13 AS ext RUN git clone https://github.com/NoiseByNorthwest/php-spx.git \ && cd php-spx \ diff --git a/layers/sqlsrv/Dockerfile b/layers/sqlsrv/Dockerfile index 7ea9bad0..f9fbee87 100644 --- a/layers/sqlsrv/Dockerfile +++ b/layers/sqlsrv/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.13 AS ext ENV LD_LIBRARY_PATH=/usr/lib:/usr/lib64:$LD_LIBRARY_PATH diff --git a/layers/uuid/Dockerfile b/layers/uuid/Dockerfile index bf406584..98929e86 100644 --- a/layers/uuid/Dockerfile +++ b/layers/uuid/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.13 AS ext ENV LD_LIBRARY_PATH=/usr/lib:/usr/lib64:$LD_LIBRARY_PATH diff --git a/layers/xdebug/Dockerfile b/layers/xdebug/Dockerfile index 44abc6c2..52f42fff 100644 --- a/layers/xdebug/Dockerfile +++ b/layers/xdebug/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.13 AS ext RUN pecl install xdebug RUN cp `php-config --extension-dir`/xdebug.so /tmp/xdebug.so diff --git a/layers/yaml/Dockerfile b/layers/yaml/Dockerfile index d2963fb0..d078f9d2 100644 --- a/layers/yaml/Dockerfile +++ b/layers/yaml/Dockerfile @@ -1,5 +1,5 @@ ARG PHP_VERSION -FROM bref/build-php-$PHP_VERSION:1.2.12 AS ext +FROM bref/build-php-$PHP_VERSION:1.2.13 AS ext ENV LIBYAML_BUILD_DIR=${BUILD_DIR}/libyaml diff --git a/tests/Dockerfile b/tests/Dockerfile index e4c9e45d..59d16da5 100644 --- a/tests/Dockerfile +++ b/tests/Dockerfile @@ -2,6 +2,6 @@ ARG PHP_VERSION ARG TARGET_IMAGE FROM bref/$TARGET_IMAGE AS ext -FROM bref/php-$PHP_VERSION:1.2.12 +FROM bref/php-$PHP_VERSION:1.2.13 COPY --from=ext /opt /opt From 3328679a29a5d80503bcea64644b4f2c258873bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20HOUZ=C3=89?= Date: Mon, 30 Aug 2021 19:12:40 +0200 Subject: [PATCH 3/3] Support xdebug master on PHP 8.1 --- CHANGELOG.md | 1 + layers/xdebug/Dockerfile | 18 +++++++++++++++--- layers/xdebug/config.json | 3 ++- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f8fea5f9..0cc691cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ - Support for pgsql on PHP 8.1. - Support for Redis on PHP 8.1. - Support for UUID on PHP 8.1. +- Support for Xdebug (master) on PHP 8.1. ## 0.11.14 diff --git a/layers/xdebug/Dockerfile b/layers/xdebug/Dockerfile index 52f42fff..2c811679 100644 --- a/layers/xdebug/Dockerfile +++ b/layers/xdebug/Dockerfile @@ -1,9 +1,21 @@ ARG PHP_VERSION FROM bref/build-php-$PHP_VERSION:1.2.13 AS ext -RUN pecl install xdebug -RUN cp `php-config --extension-dir`/xdebug.so /tmp/xdebug.so -RUN echo 'zend_extension=/opt/bref-extra/xdebug.so' > /tmp/ext.ini +RUN set -xe; \ + if [ $PHP_VERSION != "81" ] ; \ + then \ + pecl install xdebug; \ + else \ + cd /tmp; \ + git clone --depth=1 https://github.com/xdebug/xdebug.git; \ + cd xdebug; \ + phpize; \ + ./configure; \ + make; \ + make install; \ + fi; \ + cp `php-config --extension-dir`/xdebug.so /tmp/xdebug.so; \ + echo 'zend_extension=/opt/bref-extra/xdebug.so' > /tmp/ext.ini # Build the final image with just the files we need FROM scratch diff --git a/layers/xdebug/config.json b/layers/xdebug/config.json index 6abe3e86..b12fe90c 100644 --- a/layers/xdebug/config.json +++ b/layers/xdebug/config.json @@ -2,6 +2,7 @@ "php": [ "73", "74", - "80" + "80", + "81" ] }