From 1f59d43aee4fa4eeecfce49aefef4efd29a0ebdb Mon Sep 17 00:00:00 2001
From: Oskar Barcz <oskar@barcz.me>
Date: Tue, 27 Jan 2026 23:30:25 +0100
Subject: [PATCH 1/3] Bump PHP to 8.4 and Alpine to 3.23

---
 .github/workflows/integrate.yaml | 18 ++++++++++++++++++
 .github/workflows/release.yaml   | 27 ++++++++++++++++++---------
 .github/workflows/test.yaml      | 11 -----------
 Dockerfile                       |  2 +-
 4 files changed, 37 insertions(+), 21 deletions(-)
 create mode 100644 .github/workflows/integrate.yaml
 delete mode 100644 .github/workflows/test.yaml

diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
new file mode 100644
index 0000000..560d4cb
--- /dev/null
+++ b/.github/workflows/integrate.yaml
@@ -0,0 +1,18 @@
+name: "test"
+on:
+  pull_request:
+    paths: [ "**", "!**.md" ]
+jobs:
+  test:
+    runs-on: "ubuntu-24.04"
+    steps:
+      - name: "Login to GitHub Container Registry",
+        uses: "docker/login-action@v2",
+        with:
+          registry: "ghcr.io"
+          username: "at-cloud-pro"
+          password: "${{secrets.GITHUB_TOKEN}}"
+      - name: "Clone Git repository"
+        uses: "actions/checkout@v3"
+      - name: "Build Docker image"
+        run: "docker build ."
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 3a4223d..95f9a3b 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -2,17 +2,26 @@ name: "release"
 on:
   push:
     branches: [ "main" ]
-    paths: [ "**", "!**.md" ]
 env:
   PACKAGE_NAME: "ghcr.io/at-cloud-pro/caddy-php"
-  PACKAGE_VERSION: "4.0.0"
+  PACKAGE_VERSION: "5.0.0"
 jobs:
   release:
-    runs-on: "ubuntu-22.04"
+    runs-on: "ubuntu-24.04"
     steps:
-      - { name: "Login to GitHub Container Registry", uses: "docker/login-action@v2", with: { registry: "ghcr.io", username: "oskarbarcz", password: "${{secrets.GITHUB_TOKEN}}" } }
-      - { name: "Set Git user", run: "git config --global user.name Github Actions && git config --global user.email github-actions@github.com" }
-      - { name: "Clone Git repository", uses: "actions/checkout@v3" }
-      - { name: "Build Docker image with new tag", run: "docker build -t ${{ env.PACKAGE_NAME}}:${{ env.PACKAGE_VERSION }} ." }
-      - { name: "Publish Docker image", run: "docker push ${{ env.PACKAGE_NAME}}:${{ env.PACKAGE_VERSION }}" }
-      - { name: "Publish tags", run: "git tag ${{ env.PACKAGE_VERSION }} && git push && git push --tags" }
+      - name: "Login to GitHub Container Registry"
+        uses: "docker/login-action@v2"
+        with:
+          registry: "ghcr.io"
+          username: "oskarbarcz"
+          password: "${{secrets.GITHUB_TOKEN}}"
+      - name: "Set Git user"
+        run: "git config --global user.name Github Actions && git config --global user.email github-actions@github.com"
+      - name: "Clone Git repository"
+        uses: "actions/checkout@v3"
+      - name: "Build Docker image with new tag"
+        run: "docker build -t ${{ env.PACKAGE_NAME}}:${{ env.PACKAGE_VERSION }} ."
+      - name: "Publish Docker image"
+        run: "docker push ${{ env.PACKAGE_NAME}}:${{ env.PACKAGE_VERSION }}"
+      - name: "Publish tags"
+        run: "git tag ${{ env.PACKAGE_VERSION }} && git push && git push --tags"
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
deleted file mode 100644
index 8ae456c..0000000
--- a/.github/workflows/test.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-name: "test"
-on:
-  pull_request:
-    paths: [ "**", "!**.md" ]
-jobs:
-  test:
-    runs-on: "ubuntu-22.04"
-    steps:
-      - { name: "Login to GitHub Container Registry", uses: "docker/login-action@v2", with: { registry: "ghcr.io", username: "at-cloud-pro", password: "${{secrets.GITHUB_TOKEN}}" } }
-      - { name: "Clone Git repository", uses: "actions/checkout@v3" }
-      - { name: "Build Docker image",  run: "docker build ." }
diff --git a/Dockerfile b/Dockerfile
index ff99888..e5f67d3 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.3-fpm-alpine3.19 AS rte
+FROM php:8.4-fpm-alpine3.23 AS rte
 
 # Install Caddy
 RUN apk add --no-cache \

From 1bf4963383699e0f6247eee2ef6e2631b8b9f415 Mon Sep 17 00:00:00 2001
From: Oskar Barcz <oskar@barcz.me>
Date: Tue, 27 Jan 2026 23:32:40 +0100
Subject: [PATCH 2/3] Bump PHP to 8.4 and Alpine to 3.23

---
 .github/workflows/integrate.yaml | 2 +-
 .github/workflows/release.yaml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
index 560d4cb..35acb45 100644
--- a/.github/workflows/integrate.yaml
+++ b/.github/workflows/integrate.yaml
@@ -10,7 +10,7 @@ jobs:
         uses: "docker/login-action@v2",
         with:
           registry: "ghcr.io"
-          username: "at-cloud-pro"
+          username: "${{github.actor}}"
           password: "${{secrets.GITHUB_TOKEN}}"
       - name: "Clone Git repository"
         uses: "actions/checkout@v3"
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 95f9a3b..a7ce645 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -13,7 +13,7 @@ jobs:
         uses: "docker/login-action@v2"
         with:
           registry: "ghcr.io"
-          username: "oskarbarcz"
+          username: "${{github.actor}}"
           password: "${{secrets.GITHUB_TOKEN}}"
       - name: "Set Git user"
         run: "git config --global user.name Github Actions && git config --global user.email github-actions@github.com"

From 873515fe3344cc10ed5342bb9ab06eaf0cdcb656 Mon Sep 17 00:00:00 2001
From: Oskar Barcz <oskar@barcz.me>
Date: Tue, 27 Jan 2026 23:33:12 +0100
Subject: [PATCH 3/3] Bump PHP to 8.4 and Alpine to 3.23

---
 .github/workflows/integrate.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
index 35acb45..a580276 100644
--- a/.github/workflows/integrate.yaml
+++ b/.github/workflows/integrate.yaml
@@ -6,8 +6,8 @@ jobs:
   test:
     runs-on: "ubuntu-24.04"
     steps:
-      - name: "Login to GitHub Container Registry",
-        uses: "docker/login-action@v2",
+      - name: "Login to GitHub Container Registry"
+        uses: "docker/login-action@v2"
         with:
           registry: "ghcr.io"
           username: "${{github.actor}}"