Skip to content

Commit cf061b3

Browse files
authored
Merge pull request #173 from shopware/update-php-matrix
chore: update PHP matrix to latest patch versions
2 parents 774c201 + 3000b4f commit cf061b3

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

docker-bake.hcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ variable "phpMatrix" {
1111
}
1212

1313
variable "frankenphpMatrix" {
14-
default = [ "8.2.29", "8.3.28", "8.4.15" ]
14+
default = [ "8.2.29", "8.3.28", "8.4.15", "8.5.0" ]
1515
}
1616

1717
# Frankenphp

frankenphp-otel/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ RUN <<EOF
1010
apt-get install -y libgrpc++1.51 libgrpc-dev git
1111
GRPC_VERSION=$(dpkg -s libgrpc-dev | grep '^Version:' | cut -d' ' -f2 | cut -d'-' -f1)
1212
git clone --depth 1 -b v${GRPC_VERSION} https://github.com/grpc/grpc /tmp/grpc
13+
cd /tmp/grpc && curl -sSL https://patch-diff.githubusercontent.com/raw/grpc/grpc/pull/40337.patch | git apply - && \
1314
cd /tmp/grpc/src/php/ext/grpc
1415
phpize
1516
./configure

frankenphp/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN <<EOF
88
set -e
99
apt-get update
1010
apt-get upgrade -y
11-
install-php-extensions bcmath gd intl mysqli pdo_mysql pcntl sockets bz2 gmp soap zip ftp ffi opcache redis apcu amqp zstd
11+
install-php-extensions bcmath gd intl mysqli pdo_mysql pcntl sockets bz2 gmp soap zip ftp ffi opcache redis apcu php-amqp/php-amqp@977449987412a3d5c59a036dbab8b6d67764bb3e zstd
1212
mkdir -p /var/www/html
1313
usermod -u 82 www-data
1414
groupmod -g 82 www-data

0 commit comments

Comments
 (0)