Skip to content

Commit

Permalink
Update php from 8.1 to 8.2
Browse files Browse the repository at this point in the history
Update composer from 2.4.4 to 2.6.5

[major] Breaking change, requires Drupal 10.
  • Loading branch information
nigelgbanks committed Nov 9, 2023
1 parent b72143e commit 98af33c
Show file tree
Hide file tree
Showing 37 changed files with 16,889 additions and 5,728 deletions.
2 changes: 1 addition & 1 deletion code-server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RUN --mount=type=cache,id=code-server-apk-${TARGETARCH},sharing=locked,target=/v
nodejs \
openssh \
parallel \
php81-pecl-xdebug \
php82-pecl-xdebug \
python3 \
spdlog \
sudo \
Expand Down
4 changes: 2 additions & 2 deletions code-server/rootfs/etc/confd/templates/drupal.fpm.conf.tmpl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Allow for toggling between xdebug / production configured fpm.
set $fpm php-fpm81;
set $fpm php-fpm82;
if ($cookie_XDEBUG_SESSION) {
set $fpm xdebug;
}
Expand Down Expand Up @@ -37,5 +37,5 @@ location ~ '\.php$|^/update.php' {
fastcgi_buffers 16 800k;
fastcgi_buffer_size 1600k;
# PHP 8 socket location.
fastcgi_pass unix:/var/run/$fpm/php-fpm81.sock;
fastcgi_pass unix:/var/run/$fpm/php-fpm82.sock;
}
6 changes: 3 additions & 3 deletions code-server/rootfs/etc/s6-overlay/s6-rc.d/xdebug/run
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ mkdir -p /run/xdebug

XDEBUG_FLAGS=$(</var/run/s6/container_environment/XDEBUG_FLAGS)

exec /usr/sbin/php-fpm81 \
--pid /var/run/xdebug/php-fpm81.pid \
exec /usr/sbin/php-fpm82 \
--pid /var/run/xdebug/php-fpm82.pid \
--prefix /var/run/xdebug \
--fpm-config /etc/php81/php-fpm.conf \
--fpm-config /etc/php82/php-fpm.conf \
-d "php_admin_value[zend_extension]=xdebug.so" \
-d "zend_extension=xdebug.so" \
"${XDEBUG_FLAGS[@]}"
4 changes: 2 additions & 2 deletions crayfish/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ FROM nginx

# When updating this commit also update the lock files in rootfs/var/www/crayfish.
ARG TARGETARCH
ARG COMMIT=d4bc375c6dd9c6df6bb4fa088629a2f8b7cf5cce
ARG COMMIT=ac8752a79e8d5caa644153c27d6258ba991b6e41
ARG FILE=${COMMIT}.tar.gz
ARG URL=https://github.com/Islandora/Crayfish/archive/${FILE}
ARG SHA256=3b4c144a98b4ed4d1fd9a6395a4e3484ecbb89cac144142d3fc187bc0e5c130a
ARG SHA256=ebc2c322c34ba7159e43ecb5504ddc11263c20fd476cfc29f8245ce16a62c5b5

# Platform agnostic does not require arch specific identifier.
RUN --mount=type=cache,id=crayfish-downloads-${TARGETARCH},sharing=locked,target=/opt/downloads \
Expand Down
10 changes: 5 additions & 5 deletions crayfish/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,27 +57,27 @@ make bake TARGET=crayfish

docker run --rm -ti \
-v $(pwd)/crayfish/rootfs/var/www/crayfish/Recast/composer.lock:/var/www/crayfish/Recast/composer.lock \
--entrypoint ash islandora.dev/crayfish:latest -c \
--entrypoint ash islandora/crayfish:local -c \
"cd /var/www/crayfish/Recast && composer update"

docker run --rm -ti \
-v $(pwd)/crayfish/rootfs/var/www/crayfish/Homarus/composer.lock:/var/www/crayfish/Homarus/composer.lock \
--entrypoint ash islandora.dev/crayfish:latest -c \
--entrypoint ash islandora/crayfish:local -c \
"cd /var/www/crayfish/Homarus && composer update"

docker run --rm -ti \
-v $(pwd)/crayfish/rootfs/var/www/crayfish/Hypercube/composer.lock:/var/www/crayfish/Hypercube/composer.lock \
--entrypoint ash islandora.dev/crayfish:latest -c \
--entrypoint ash islandora/crayfish:local -c \
"cd /var/www/crayfish/Hypercube && composer update"

docker run --rm -ti \
-v $(pwd)/crayfish/rootfs/var/www/crayfish/Houdini/composer.lock:/var/www/crayfish/Houdini/composer.lock \
--entrypoint ash islandora.dev/crayfish:latest -c \
--entrypoint ash islandora/crayfish:local -c \
"cd /var/www/crayfish/Houdini && composer update"

docker run --rm -ti \
-v $(pwd)/crayfish/rootfs/var/www/crayfish/Milliner/composer.lock:/var/www/crayfish/Milliner/composer.lock \
--entrypoint ash islandora.dev/crayfish:latest -c \
--entrypoint ash islandora/crayfish:local -c \
"cd /var/www/crayfish/Milliner && composer update"
```

Expand Down
2 changes: 1 addition & 1 deletion crayfish/rootfs/etc/nginx/http.d/default.conf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ server {
}

location ~ ^/index\.php(/|$) {
fastcgi_pass unix:/var/run/php-fpm81/php-fpm81.sock;
fastcgi_pass unix:/var/run/php-fpm82/php-fpm82.sock;
fastcgi_split_path_info ^(.+\.php)(/.*)$;
include fastcgi_params;

Expand Down
Loading

0 comments on commit 98af33c

Please sign in to comment.