Upgrade to php:8.4 and node:22

CI: fix `docker-compose: command not found`

Author: rm-yakovenko

.github/workflows/test.yml

@@ -17,15 +17,15 @@ jobs:
       - name: Build
         run: |
           cp .env.dist .env
-          XDEBUG=1 docker-compose build
+          XDEBUG=1 docker compose build
 
       - name: Test
         run: |
           export MYSQL_ROOT_PASSWORD=root
           set -x
           ln -sr docker-compose.dev.yml docker-compose.override.yml
           docker/console php -i
-          docker-compose up -d
+          docker compose up -d
           curl -f localhost:8080
           docker/console id
           docker/redis-cli info

docker/app/Dockerfile

@@ -1,11 +1,11 @@
-ARG PHP_VERSION=8.1
+ARG PHP_VERSION=8.4
 
 FROM php:$PHP_VERSION-fpm
 
 ARG PECL_EXTENSIONS="apcu redis"
 
 RUN apt-get -y update && \
-    apt-get -y install --no-install-recommends git unzip libpng-dev libjpeg-dev libfreetype6-dev libicu-dev libzip-dev libxml2-dev libxslt-dev libwebp-dev python2 && \
+    apt-get -y install --no-install-recommends git unzip libpng-dev libjpeg-dev libfreetype6-dev libicu-dev libzip-dev libxml2-dev libxslt-dev libwebp-dev python3 && \
     docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ --with-webp=/usr && \
     docker-php-ext-install -j$(nproc) pdo_mysql bcmath gd intl opcache zip soap xsl && \
     pecl install $PECL_EXTENSIONS && \
@@ -18,7 +18,7 @@ RUN apt-get -y update && \
 RUN curl -Lo /usr/bin/composer https://getcomposer.org/composer-stable.phar && \
     chmod +x /usr/bin/composer
 
-ARG NODE_VERSION=16
+ARG NODE_VERSION=22
 
 RUN curl -sL https://deb.nodesource.com/setup_${NODE_VERSION}.x | bash && \
     apt-get install -y nodejs

docker/console

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker-compose run --rm app $@
+docker compose run --rm app $@