Add support for PHP 8.4 (#108)

smortexa · web-flow · commit 7564a23bd1fe · 2025-01-01T01:18:57.000+03:30
diff --git a/.github/workflows/frankenphp-test.yml b/.github/workflows/frankenphp-test.yml
@@ -15,11 +15,11 @@ on:
 jobs:
   debian-build:
     name: Build and Run Debian-based Docker image
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: true
       matrix:
-        php: [ 8.2, 8.3 ]
+        php: [ 8.3, 8.4 ]
     timeout-minutes: 15
     steps:
       - name: Checkout code
@@ -35,10 +35,10 @@ jobs:
 
       - name: Get Composer cache directory
         id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache PHP dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: "${{ runner.os }}-composer-${{ matrix.setup }}"
@@ -63,22 +63,25 @@ jobs:
         working-directory: /var/www/app
 
       - name: Run the Docker container
-        run: docker run -d --rm -p 8000:8000 app:local
+        run: docker run -d --name app --rm -p 8000:8000 app:local
         working-directory: /var/www/app
 
       - name: Wait for the container
-        run: sleep 10s
+        run: sleep 30s
+
+      - name: Print the container logs
+        run: docker logs app
 
       - name: Check application health
         run: curl -f -s -o /dev/null -w "%{http_code}" http://localhost:8000
 
   alpine-build:
     name: Build and Run Alpine-based Docker image
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: true
       matrix:
-        php: [ 8.2, 8.3 ]
+        php: [ 8.3, 8.4 ]
     timeout-minutes: 15
     steps:
       - name: Checkout code
@@ -94,10 +97,10 @@ jobs:
 
       - name: Get Composer cache directory
         id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache PHP dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: "${{ runner.os }}-composer-${{ matrix.setup }}"
@@ -122,11 +125,14 @@ jobs:
         working-directory: /var/www/app
 
       - name: Run the Docker container
-        run: docker run -d --rm -p 8000:8000 app:local
+        run: docker run -d --name app --rm -p 8000:8000 app:local
         working-directory: /var/www/app
 
       - name: Wait for the container
-        run: sleep 10s
+        run: sleep 30s
+
+      - name: Print the container logs
+        run: docker logs app
 
       - name: Check application health
         run: curl -f -s -o /dev/null -w "%{http_code}" http://localhost:8000
diff --git a/.github/workflows/roadrunner-test.yml b/.github/workflows/roadrunner-test.yml
@@ -15,11 +15,11 @@ on:
 jobs:
   debian-build:
     name: Build and Run Debian-based Docker image
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: true
       matrix:
-        php: [ 8.2, 8.3 ]
+        php: [ 8.3, 8.4 ]
     timeout-minutes: 15
     steps:
       - name: Checkout code
@@ -35,10 +35,10 @@ jobs:
 
       - name: Get Composer cache directory
         id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache PHP dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: "${{ runner.os }}-composer-${{ matrix.setup }}"
@@ -63,22 +63,25 @@ jobs:
         working-directory: /var/www/app
 
       - name: Run the Docker container
-        run: docker run -d --rm -p 8000:8000 app:local
+        run: docker run -d --name app --rm -p 8000:8000 app:local
         working-directory: /var/www/app
 
       - name: Wait for the container
-        run: sleep 10s
+        run: sleep 30s
+
+      - name: Print the container logs
+        run: docker logs app
 
       - name: Check application health
         run: curl -f -s -o /dev/null -w "%{http_code}" http://localhost:8000
 
   alpine-build:
     name: Build and Run Alpine-based Docker image
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: true
       matrix:
-        php: [ 8.2, 8.3 ]
+        php: [ 8.3, 8.4 ]
     timeout-minutes: 15
     steps:
       - name: Checkout code
@@ -94,10 +97,10 @@ jobs:
 
       - name: Get Composer cache directory
         id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache PHP dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: "${{ runner.os }}-composer-${{ matrix.setup }}"
@@ -122,11 +125,14 @@ jobs:
         working-directory: /var/www/app
 
       - name: Run the Docker container
-        run: docker run -d --rm -p 8000:8000 app:local
+        run: docker run -d --name app --rm -p 8000:8000 app:local
         working-directory: /var/www/app
 
       - name: Wait for the container
-        run: sleep 10s
+        run: sleep 30s
+
+      - name: Print the container logs
+        run: docker logs app
 
       - name: Check application health
         run: curl -f -s -o /dev/null -w "%{http_code}" http://localhost:8000
diff --git a/.github/workflows/swoole-test.yml b/.github/workflows/swoole-test.yml
@@ -15,11 +15,11 @@ on:
 jobs:
   debian-build:
     name: Build and Run Debian-based Docker image
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: true
       matrix:
-        php: [ 8.2, 8.3 ]
+        php: [ 8.3, 8.4 ]
     timeout-minutes: 15
     steps:
       - name: Checkout code
@@ -35,10 +35,10 @@ jobs:
 
       - name: Get Composer cache directory
         id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache PHP dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: "${{ runner.os }}-composer-${{ matrix.setup }}"
@@ -63,22 +63,25 @@ jobs:
         working-directory: /var/www/app
 
       - name: Run the Docker container
-        run: docker run -d --rm -p 8000:8000 app:local
+        run: docker run -d --name app --rm -p 8000:8000 app:local
         working-directory: /var/www/app
 
       - name: Wait for the container
-        run: sleep 10s
+        run: sleep 30s
+
+      - name: Print the container logs
+        run: docker logs app
 
       - name: Check application health
         run: curl -f -s -o /dev/null -w "%{http_code}" http://localhost:8000
 
   alpine-build:
     name: Build and Run Alpine-based Docker image
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: true
       matrix:
-        php: [ 8.2, 8.3 ]
+        php: [ 8.3, 8.4 ]
     timeout-minutes: 15
     steps:
       - name: Checkout code
@@ -94,10 +97,10 @@ jobs:
 
       - name: Get Composer cache directory
         id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache PHP dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: "${{ runner.os }}-composer-${{ matrix.setup }}"
@@ -122,11 +125,14 @@ jobs:
         working-directory: /var/www/app
 
       - name: Run the Docker container
-        run: docker run -d --rm -p 8000:8000 app:local
+        run: docker run -d --name app --rm -p 8000:8000 app:local
         working-directory: /var/www/app
 
       - name: Wait for the container
-        run: sleep 10s
+        run: sleep 30s
+
+      - name: Print the container logs
+        run: docker logs app
 
       - name: Check application health
         run: curl -f -s -o /dev/null -w "%{http_code}" http://localhost:8000
diff --git a/FrankenPHP.Alpine.Dockerfile b/FrankenPHP.Alpine.Dockerfile
@@ -1,4 +1,4 @@
-ARG PHP_VERSION=8.3
+ARG PHP_VERSION=8.4
 ARG FRANKENPHP_VERSION=1.3.6
 ARG COMPOSER_VERSION=2.8
 ARG BUN_VERSION="latest"
diff --git a/FrankenPHP.Dockerfile b/FrankenPHP.Dockerfile
@@ -1,4 +1,4 @@
-ARG PHP_VERSION=8.3
+ARG PHP_VERSION=8.4
 ARG FRANKENPHP_VERSION=1.3.6
 ARG COMPOSER_VERSION=2.8
 ARG BUN_VERSION="latest"
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ powered web services and microservices.
 
 The Docker configuration provides the following setup:
 
-- PHP 8.2 and 8.3 official Debian-based and Alpine-based images
+- PHP 8.3 and 8.4 official Debian-based and Alpine-based images
 - Preconfigured PHP runtime, JIT compiler, and OPcache
 - Preconfigured Caddy server
 - Preconfigured Swoole HTTP server
@@ -99,7 +99,7 @@ return [
 
 ## ToDo
 - [ ] Add Docker Compose
-- [ ] Add support for PHP 8.4
+- [x] Add support for PHP 8.4
 - [x] Add support for worker mode
 - [x] Build assets with Bun
 - [ ] Create standalone and self-executable app
diff --git a/RoadRunner.Alpine.Dockerfile b/RoadRunner.Alpine.Dockerfile
@@ -1,4 +1,4 @@
-ARG PHP_VERSION=8.3
+ARG PHP_VERSION=8.4
 ARG COMPOSER_VERSION=2.8
 ARG BUN_VERSION="latest"
 
diff --git a/RoadRunner.Dockerfile b/RoadRunner.Dockerfile
@@ -1,4 +1,4 @@
-ARG PHP_VERSION=8.3
+ARG PHP_VERSION=8.4
 ARG COMPOSER_VERSION=2.8
 ARG BUN_VERSION="latest"
 
diff --git a/Swoole.Alpine.Dockerfile b/Swoole.Alpine.Dockerfile
@@ -1,4 +1,4 @@
-ARG PHP_VERSION=8.3
+ARG PHP_VERSION=8.4
 ARG COMPOSER_VERSION=2.8
 ARG BUN_VERSION="latest"
 
diff --git a/Swoole.Dockerfile b/Swoole.Dockerfile
@@ -1,4 +1,4 @@
-ARG PHP_VERSION=8.3
+ARG PHP_VERSION=8.4
 ARG COMPOSER_VERSION=2.8
 ARG BUN_VERSION="latest"
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-ARG PHP_VERSION=8.3`
	`1`	`+ARG PHP_VERSION=8.4`
`2`	`2`	`ARG FRANKENPHP_VERSION=1.3.6`
`3`	`3`	`ARG COMPOSER_VERSION=2.8`
`4`	`4`	`ARG BUN_VERSION="latest"`