Update alpine & PHP to 8.2 (#299)

* Updated alpine to 3.18.4 and external dependencies (imagemagick & leptonica).

* Update php from 8.1 to 8.2
Update composer from 2.4.4 to 2.6.5
Update crayfish to 4.x
Change crayfits to come from crayfish repository

[major] Breaking change, requires Drupal 10.

code-server/Dockerfile

@@ -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 \

code-server/rootfs/etc/confd/templates/drupal.fpm.conf.tmpl

@@ -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;
 }
@@ -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;
 }

code-server/rootfs/etc/s6-overlay/s6-rc.d/xdebug/run

@@ -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[@]}"

crayfish/Dockerfile

@@ -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=6ba190c3ffebabb83e977c6515ecfd022692f6e5
 ARG FILE=${COMMIT}.tar.gz
 ARG URL=https://github.com/Islandora/Crayfish/archive/${FILE}
-ARG SHA256=3b4c144a98b4ed4d1fd9a6395a4e3484ecbb89cac144142d3fc187bc0e5c130a
+ARG SHA256=3fb7ae787be43a719f66a3d98efff85766056cf2d962365d9e821ff3a9f813ee
 
 # Platform agnostic does not require arch specific identifier.
 RUN --mount=type=cache,id=crayfish-downloads-${TARGETARCH},sharing=locked,target=/opt/downloads \

crayfish/README.md

@@ -57,30 +57,35 @@ 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"
+
+docker run --rm -ti \
+  -v $(pwd)/crayfish/rootfs/var/www/crayfish/CrayFits/composer.lock:/var/www/crayfish/CrayFits/composer.lock \
+  --entrypoint ash islandora/crayfish:local -c \
+    "cd /var/www/crayfish/CrayFits && composer update"
 ```
 
 [base image]: ../base/README.md
 [nginx image]: ../nginx/README.md
-[Crayfish]: https://github.com/Islandora/Crayfish/tree/main
+[Crayfish]: https://github.com/Islandora/Crayfish/tree/4.x

crayfish/rootfs/etc/nginx/http.d/default.conf

@@ -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;