Skip to content

Adding php 81 for most extensions #261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Nyholm merged 3 commits into from
Aug 30, 2021
Merged

Adding php 81 for most extensions #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ee021e
Adding php 81 for most extensions
Aug 29, 2021
46d738c
Use 1.2.13 as base bref image
Aug 30, 2021
3328679
Support xdebug master on PHP 8.1
Aug 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,29 @@
# Change log

## 0.12.0
Copy link
Collaborator

@Nyholm Nyholm Aug 30, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will change this to 0.11.15 before releasing.
There are no BC breaks here.


### Changed

- Using bref/build-php-XX:1.2.13 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.
- Support for Xdebug (master) on PHP 8.1.

## 0.11.14

### Added
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}
},
"conflict": {
"bref/bref": "<1.1.4"
"bref/bref": "<1.2.13"
},
"license": "MIT",
"authors": [
Expand Down
2 changes: 1 addition & 1 deletion layers/amqp/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.13 AS ext
ARG PHP_VERSION

ENV LIBRABBITMQ_BUILD_DIR=${BUILD_DIR}/librabbitmq
Expand Down
2 changes: 1 addition & 1 deletion layers/blackfire/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.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 \
Expand Down
2 changes: 1 addition & 1 deletion layers/calendar/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.13 AS ext

WORKDIR ${PHP_BUILD_DIR}/ext/calendar
RUN phpize && \
Expand Down
3 changes: 2 additions & 1 deletion layers/calendar/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"php": [
"73",
"74",
"80"
"80",
"81"
]
}
2 changes: 1 addition & 1 deletion layers/cassandra/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.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 :-)
Expand Down
2 changes: 1 addition & 1 deletion layers/ds/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.13 AS ext

RUN pecl install ds
RUN cp `php-config --extension-dir`/ds.so /tmp/ds.so
Expand Down
2 changes: 1 addition & 1 deletion layers/gd/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.13 AS ext

# Install required build libraries
RUN set -ue \
Expand Down
3 changes: 2 additions & 1 deletion layers/gd/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"php": [
"73",
"74",
"80"
"80",
"81"
]
}
2 changes: 1 addition & 1 deletion layers/gmp/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.13 AS ext

# Fix library path
ENV LD_LIBRARY_PATH=/usr/lib:/usr/lib64:$LD_LIBRARY_PATH
Expand Down
3 changes: 2 additions & 1 deletion layers/gmp/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"php": [
"73",
"74",
"80"
"80",
"81"
]
}
2 changes: 1 addition & 1 deletion layers/grpc/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.13 AS ext

RUN pecl install grpc > /dev/null
RUN cp `php-config --extension-dir`/grpc.so /tmp/grpc.so
Expand Down
3 changes: 2 additions & 1 deletion layers/grpc/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"php": [
"73",
"74",
"80"
"80",
"81"
]
}
2 changes: 1 addition & 1 deletion layers/igbinary/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.13 AS ext

RUN pecl install igbinary
RUN cp `php-config --extension-dir`/igbinary.so /tmp/igbinary.so
Expand Down
3 changes: 2 additions & 1 deletion layers/igbinary/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"php": [
"73",
"74",
"80"
"80",
"81"
]
}
2 changes: 1 addition & 1 deletion layers/imagick/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.13 AS ext
ARG PHP_VERSION

# Prepare environment
Expand Down
2 changes: 1 addition & 1 deletion layers/imap/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.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
Expand Down
3 changes: 2 additions & 1 deletion layers/imap/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"php": [
"73",
"74"
"74",
"81"
]
}
2 changes: 1 addition & 1 deletion layers/ldap/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.13 AS ext

ENV LD_LIBRARY_PATH=/usr/lib:/usr/lib64:$LD_LIBRARY_PATH

Expand Down
3 changes: 2 additions & 1 deletion layers/ldap/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"php": [
"73",
"74",
"80"
"80",
"81"
]
}
2 changes: 1 addition & 1 deletion layers/mailparse/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.13 AS ext

ENV LD_LIBRARY_PATH=/usr/lib:/usr/lib64:$LD_LIBRARY_PATH
RUN yum install -y re2c
Expand Down
2 changes: 1 addition & 1 deletion layers/memcache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.13 AS ext
ARG PHP_VERSION

ENV LIBMEMCACHED_BUILD_DIR=${BUILD_DIR}/libmemcached
Expand Down
2 changes: 1 addition & 1 deletion layers/memcached/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.13 AS ext

ENV LIBMEMCACHED_BUILD_DIR=${BUILD_DIR}/libmemcached

Expand Down
3 changes: 2 additions & 1 deletion layers/memcached/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"php": [
"73",
"74"
"74",
"81"
]
}
2 changes: 1 addition & 1 deletion layers/mongodb/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.13 AS ext

RUN pecl install --force mongodb
RUN cp `php-config --extension-dir`/mongodb.so /tmp/mongodb.so
Expand Down
2 changes: 1 addition & 1 deletion layers/msgpack/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.13 AS ext

RUN pecl install msgpack
RUN cp `php-config --extension-dir`/msgpack.so /tmp/msgpack.so
Expand Down
3 changes: 2 additions & 1 deletion layers/msgpack/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"php": [
"73",
"74",
"80"
"80",
"81"
]
}
2 changes: 1 addition & 1 deletion layers/newrelic/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.13 AS ext

# Build the New Relic Agent install silently for PHP Agent 9.17

Expand Down
2 changes: 1 addition & 1 deletion layers/odbc-snowflake/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.13 AS ext

ENV LD_LIBRARY_PATH=/usr/lib:/usr/lib64:$LD_LIBRARY_PATH
RUN yum install -y unixODBC unixODBC-devel
Expand Down
3 changes: 2 additions & 1 deletion layers/odbc-snowflake/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"php": [
"73",
"74",
"80"
"80",
"81"
]
}
2 changes: 1 addition & 1 deletion layers/pcov/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.13 AS ext

RUN pecl install pcov
RUN cp `php-config --extension-dir`/pcov.so /tmp/pcov.so
Expand Down
3 changes: 2 additions & 1 deletion layers/pcov/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"php": [
"73",
"74",
"80"
"80",
"81"
]
}
2 changes: 1 addition & 1 deletion layers/pgsql/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.13 AS ext

WORKDIR ${PHP_BUILD_DIR}/ext/pgsql
RUN phpize
Expand Down
3 changes: 2 additions & 1 deletion layers/pgsql/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"php": [
"73",
"74",
"80"
"80",
"81"
]
}
2 changes: 1 addition & 1 deletion layers/rdkafka/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.13 AS ext

ENV LIBRDKAFKA_BUILD_DIR=${BUILD_DIR}/librdkafka

Expand Down
2 changes: 1 addition & 1 deletion layers/redis/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.13 AS ext

RUN pecl install --force redis
RUN cp `php-config --extension-dir`/redis.so /tmp/redis.so
Expand Down
3 changes: 2 additions & 1 deletion layers/redis/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"php": [
"73",
"74",
"80"
"80",
"81"
]
}
2 changes: 1 addition & 1 deletion layers/scrypt/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.13 AS ext

RUN pecl install scrypt
RUN cp `php-config --extension-dir`/scrypt.so /tmp/scrypt.so
Expand Down
2 changes: 1 addition & 1 deletion layers/spx/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.13 AS ext

RUN git clone https://github.com/NoiseByNorthwest/php-spx.git \
&& cd php-spx \
Expand Down
4 changes: 2 additions & 2 deletions layers/sqlsrv/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.13 AS ext

ENV LD_LIBRARY_PATH=/usr/lib:/usr/lib64:$LD_LIBRARY_PATH

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion layers/uuid/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.13 AS ext

ENV LD_LIBRARY_PATH=/usr/lib:/usr/lib64:$LD_LIBRARY_PATH

Expand Down
3 changes: 2 additions & 1 deletion layers/uuid/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"php": [
"73",
"74",
"80"
"80",
"81"
]
}
20 changes: 16 additions & 4 deletions layers/xdebug/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,21 @@
ARG PHP_VERSION
FROM bref/build-php-$PHP_VERSION:1.1.4 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
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
Expand Down
3 changes: 2 additions & 1 deletion layers/xdebug/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"php": [
"73",
"74",
"80"
"80",
"81"
]
}
Loading