Merge pull request #90 from jkaninda/dev

Upgrade images to PHP 8.5 and fix php-fpm not starting as root

tests/compose.yaml

@@ -1,41 +1,45 @@
-version: '3'
 services:
-    mysql:
-      image: mysql:8.0
-      container_name: mysql
-      restart: unless-stopped
-      environment:
-        MYSQL_DATABASE: php
-        MYSQL_ROOT_PASSWORD: password
-        MYSQL_PASSWORD: password
-        MYSQL_USER: php
-      ports:
-       - 3306:3306
-    php-fpm:
-        image: jkaninda/laravel-php-fpm:latest
-        container_name: php-fpm
-        restart: unless-stopped
-        #user: www-data #Use www-data user  production usage
-        depends_on:
-         - mysql
-        environment:
-          DB_HOST: mysql
-          DB_PORT: 3306
-          DB_DATABASE: php
-          DB_USERNAME: php
-          DB_PASSWORD: password
-        volumes:
-            - ./laravel:/var/www/html
-     #Nginx server
-    nginx-server:
-     image: jkaninda/nginx-fpm:stable
-     container_name: nginx-server
-     restart: unless-stopped
-     ports:
-      - 80:80
-     volumes:
+  mysql:
+    image: mysql:8.4
+    container_name: mysql
+    restart: unless-stopped
+    environment:
+      MYSQL_DATABASE: php
+      MYSQL_ROOT_PASSWORD: password
+      MYSQL_PASSWORD: password
+      MYSQL_USER: php
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "127.0.0.1", "-ppassword"]
+      interval: 5s
+      timeout: 5s
+      retries: 30
+  php-fpm:
+    image: ${IMAGE:-jkaninda/laravel-php-fpm:latest}
+    container_name: php-fpm
+    restart: unless-stopped
+    depends_on:
+      mysql:
+        condition: service_healthy
+    environment:
+      DB_CONNECTION: mysql
+      DB_HOST: mysql
+      DB_PORT: 3306
+      DB_DATABASE: php
+      DB_USERNAME: php
+      DB_PASSWORD: password
+    volumes:
       - ./laravel:/var/www/html
-     environment:
-       - DOCUMENT_ROOT=/var/www/html/public
-       - CLIENT_MAX_BODY_SIZE=20M
-       - PHP_FPM_HOST=php-fpm:9000
+  nginx-server:
+    image: jkaninda/nginx-fpm:stable
+    container_name: nginx-server
+    restart: unless-stopped
+    depends_on:
+      - php-fpm
+    ports:
+      - "${HTTP_PORT:-80}:80"
+    volumes:
+      - ./laravel:/var/www/html
+    environment:
+      - DOCUMENT_ROOT=/var/www/html/public
+      - CLIENT_MAX_BODY_SIZE=20M
+      - PHP_FPM_HOST=php-fpm:9000

tests/integration.sh

@@ -0,0 +1,65 @@
+#!/bin/sh
+# Integration test: create a Laravel project with the image, serve it through
+# Nginx, run migrations and check that PHP-FPM, the queue worker and the
+# scheduler are running.
+# Usage: IMAGE=jkaninda/laravel-php-fpm:8.5 [HTTP_PORT=8080] ./tests/integration.sh
+set -eu
+
+IMAGE="${IMAGE:-jkaninda/laravel-php-fpm:latest}"
+HTTP_PORT="${HTTP_PORT:-80}"
+export IMAGE HTTP_PORT
+cd "$(dirname "$0")"
+
+cleanup() {
+    docker compose logs php-fpm || true
+    docker compose down -v --remove-orphans || true
+}
+trap cleanup EXIT
+
+echo "==> Checking PHP extensions"
+docker run --rm "$IMAGE" php -m > modules.txt
+for ext in bcmath exif gd intl mbstring memcached pcntl pdo_mysql pdo_pgsql rdkafka redis zip "Zend OPcache"; do
+    grep -qx "$ext" modules.txt || { echo "Missing extension: $ext"; exit 1; }
+done
+if docker run --rm "$IMAGE" php -m 2>&1 | grep -iE 'warning|unable to load'; then
+    echo "PHP startup warnings detected"; exit 1
+fi
+rm -f modules.txt
+docker run --rm "$IMAGE" sh -c 'php -v && composer -V && node -v && npm -v'
+
+echo "==> Creating Laravel project"
+rm -rf laravel
+docker run --rm -v "$PWD:/app" -w /app "$IMAGE" \
+    composer create-project --prefer-dist --no-interaction --no-progress laravel/laravel laravel
+docker run --rm -v "$PWD/laravel:/var/www/html" "$IMAGE" \
+    chown -R www-data:www-data storage bootstrap/cache database
+
+echo "==> Starting stack"
+docker compose up -d
+
+echo "==> Waiting for PHP-FPM to be healthy"
+i=0
+until [ "$(docker inspect -f '{{.State.Health.Status}}' php-fpm)" = "healthy" ]; do
+    i=$((i + 1)); [ "$i" -gt 60 ] && { echo "PHP-FPM not healthy"; exit 1; }
+    sleep 2
+done
+
+echo "==> Running migrations"
+docker exec --user www-data php-fpm php artisan migrate --force
+
+echo "==> Checking HTTP response"
+code=$(curl -s -o /dev/null -w '%{http_code}' "http://localhost:$HTTP_PORT")
+echo "HTTP $code"
+[ "$code" = "200" ]
+
+echo "==> Checking supervisor programs"
+for program in php-fpm Laravel-worker Laravel-scheduler; do
+    i=0
+    until docker exec php-fpm supervisorctl status | grep "^$program" | grep -q RUNNING; do
+        i=$((i + 1)); [ "$i" -gt 30 ] && { echo "$program is not running"; docker exec php-fpm supervisorctl status; exit 1; }
+        sleep 2
+    done
+done
+docker exec php-fpm supervisorctl status
+
+echo "==> All tests passed"