fix: migrate from jcabillot/phpapache to dunglas/frankenphp

Merge pull request 'fix(ci): correct corrupted docker/login-action SHA (41 chars)' (#21 ) from fix/login-action-sha into master
Reviewed-on: #21
2026-06-29 12:35:58 +00:00 · 2026-06-29 08:16:55 -04:00 · 2026-06-29 12:13:57 +00:00 · 2026-06-29 08:08:18 -04:00 · 2026-06-29 12:05:31 +00:00
5 changed files with 23 additions and 22 deletions
@@ -30,7 +30,7 @@ jobs:
        with:
          fetch-depth: 0
      - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
-      - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2df7f5ca915bee # v4
+      - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -44,7 +44,7 @@ jobs:
          images: jcabillot/ip
          tags: |
            type=raw,value=${{ steps.get-latest-tag.outputs.tag }}-latest,enable=${{ steps.get-latest-tag.outputs.tag != '' }}
-      - uses: docker/build-push-action@f9f3042f7e2789586610d7f5c8f03e5195baf # v7.2.0
+      - uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
        with:
          context: .
          push: true
@@ -28,7 +28,7 @@ jobs:
    steps:
      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
      - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
-      - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2df7f5ca915bee # v4
+      - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -39,7 +39,7 @@ jobs:
          tags: |
            type=ref,event=tag
            type=ref,event=tag,suffix=-latest
-      - uses: docker/build-push-action@f9f3042f7e2789586610d7f5c8f03e5195baf # v7.2.0
+      - uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
        with:
          context: .
          push: true
@@ -0,0 +1,11 @@
+{
+    auto_https off
+    frankenphp
+}
+
+:8080 {
+    root * /app/public
+    encode zstd br gzip
+    php_server
+    file_server
+}
@@ -1,5 +1,9 @@
-ARG  VERSION="latest"
-FROM "jcabillot/phpapache:${VERSION}"
+FROM dunglas/frankenphp:1-php8.5-alpine
 LABEL maintainer="Julien Cabillot <dockerimages@cabillot.eu>"

-COPY "root" "/var/www/html"
+WORKDIR /app
+
+COPY Caddyfile /etc/frankenphp/Caddyfile
+COPY --chown=www-data:www-data root /app/public
+
+USER www-data
@@ -1,17 +1,3 @@
 {
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "customManagers": [
-    {
-      "customType": "regex",
-      "description": "Detect ARG VERSION pin for jcabillot/phpapache base image",
-      "managerFilePatterns": [
-        "/^Dockerfile$/"
-      ],
-      "matchStrings": [
-        "ARG\\s+VERSION=\"(?<currentValue>[^\"]+)\""
-      ],
-      "depNameTemplate": "jcabillot/phpapache",
-      "datasourceTemplate": "docker"
-    }
-  ]
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json"
 }
Author	SHA1	Message	Date
Sagent	af335e6708	fix: migrate from jcabillot/phpapache to dunglas/frankenphp PR Checks / hadolint (pull_request) Successful in 9s Details PR Checks / build-test (pull_request) Successful in 17s Details	2026-06-29 12:35:58 +00:00
jcabillot	7c780311e1	Merge pull request 'fix(ci): correct corrupted docker/login-action SHA (41 chars)' (#21 ) from fix/login-action-sha into master Main Release / hadolint (push) Successful in 7s Details Main Release / test (push) Successful in 14s Details Main Release / build (push) Successful in 13s Details Main Release / tag (push) Successful in 14s Details Tag Release / hadolint (push) Successful in 8s Details Tag Release / test (push) Successful in 15s Details Tag Release / build-push (push) Successful in 47s Details Reviewed-on: #21	2026-06-29 08:16:55 -04:00
cloudix_mcp_server	eaa33a9d74	fix(ci): correct corrupted docker/login-action SHA (41 chars) PR Checks / hadolint (pull_request) Successful in 11s Details PR Checks / build-test (pull_request) Successful in 18s Details Extra "f" character inserted at position 29 made the SHA 41 chars instead of 40, causing "reference not found" on Gitea Actions runner. Fixes CI run #2440 job #6174.	2026-06-29 12:13:57 +00:00
jcabillot	b2c7777597	Merge pull request 'fix(ci): correct corrupted docker/build-push-action SHA' (#20 ) from fix/build-push-action-sha into master Main Release / hadolint (push) Successful in 10s Details Main Release / test (push) Successful in 17s Details Main Release / build (push) Successful in 17s Details Main Release / tag (push) Successful in 39s Details Tag Release / hadolint (push) Successful in 7s Details Tag Release / test (push) Successful in 14s Details Tag Release / build-push (push) Failing after 4s Details Reviewed-on: #20	2026-06-29 08:08:18 -04:00
cloudix_mcp_server	0ec94f79d4	fix(ci): correct corrupted docker/build-push-action SHA PR Checks / hadolint (pull_request) Successful in 8s Details PR Checks / build-test (pull_request) Successful in 15s Details The SHA for docker/build-push-action@v7.2.0 in tag.yaml and cron.yaml was corrupted: 0d7f5c8f should be 0d6e8b85. Correct SHA from git ls-remote refs/tags/v7.2.0: f9f3042f7e2789586610d6e8b85c8f03e5195baf Fixes CI run #2437 job #6165 (reference not found on docker/login-action clone — likely cascade from the corrupted build-push-action SHA).	2026-06-29 12:05:31 +00:00