Merge pull request 'fix: migrate from jcabillot/phpapache to dunglas/frankenphp' (#22 ) from fix/frankenphp-migration into master

Reviewed-on: #22
fix: migrate from jcabillot/phpapache to dunglas/frankenphp
2026-06-29 08:54:45 -04:00 · 2026-06-29 12:50:50 +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
6 changed files with 35 additions and 20 deletions
@@ -9,7 +9,7 @@ jobs:
    runs-on: ubuntu-latest
    continue-on-error: true
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
      - uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
        with:
          dockerfile: Dockerfile
@@ -17,7 +17,7 @@ jobs:
  test:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
      - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
      - run: docker build -t ci-image:${{ github.sha }} .
      - run: bash tests/test.sh ci-image:${{ github.sha }}
@@ -26,11 +26,11 @@ jobs:
    needs: [test]
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
        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
@@ -9,7 +9,7 @@ jobs:
    runs-on: ubuntu-latest
    continue-on-error: true
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
      - uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
        with:
          dockerfile: Dockerfile
@@ -17,7 +17,7 @@ jobs:
  test:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
      - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
      - run: docker build -t ci-image:${{ github.sha }} .
      - run: bash tests/test.sh ci-image:${{ github.sha }}
@@ -26,7 +26,7 @@ jobs:
    needs: [test]
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
      - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
      - run: docker build -t jcabillot/ip:${{ github.sha }} .

@@ -34,13 +34,13 @@ jobs:
    needs: [build]
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
        with:
          fetch-depth: 0
      - name: Configure git auth
        run: |
          git remote set-url origin "https://x-access-token:${{ secrets.SA_TOKEN_ACTION_PUSH_TAGS }}@scm.cabillot.eu/web/ip.git"
-      - uses: anothrNick/github-tag-action@ed44965e0db8dab2b46616da9f2a04ec312fd8 # v1.75.0
+      - uses: anothrNick/github-tag-action@4ed44965e0db8dab2b466a16da04aec3cc312fd8 # v1.75.0
        env:
          GITHUB_TOKEN: ${{ secrets.SA_TOKEN_ACTION_PUSH_TAGS }}
          DEFAULT_BUMP: patch
@@ -8,7 +8,7 @@ jobs:
  hadolint:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
      - uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
        with:
          dockerfile: Dockerfile
@@ -16,7 +16,7 @@ jobs:
  build-test:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
      - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
      - run: docker build -t ci-image:${{ github.sha }} .
      - run: bash tests/test.sh ci-image:${{ github.sha }}
@@ -9,7 +9,7 @@ jobs:
    runs-on: ubuntu-latest
    continue-on-error: true
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
      - uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
        with:
          dockerfile: Dockerfile
@@ -17,7 +17,7 @@ jobs:
  test:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
      - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
      - run: docker build -t ci-image:${{ github.sha }} .
      - run: bash tests/test.sh ci-image:${{ github.sha }}
@@ -26,9 +26,9 @@ jobs:
    needs: [test]
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - 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
+    try_files {path} /index.php?{query}
+    php_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
Author	SHA1	Message	Date
jcabillot	b9ee6ab52b	Merge pull request 'fix: migrate from jcabillot/phpapache to dunglas/frankenphp' (#22 ) from fix/frankenphp-migration into master Main Release / hadolint (push) Successful in 10s Details Main Release / test (push) Successful in 15s Details Main Release / build (push) Successful in 11s Details Main Release / tag (push) Successful in 34s Details Tag Release / hadolint (push) Successful in 10s Details Tag Release / test (push) Successful in 16s Details Tag Release / build-push (push) Successful in 56s Details Reviewed-on: #22	2026-06-29 08:54:45 -04:00
Sagent	7a5a53b3db	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 15s Details	2026-06-29 12:50:50 +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
jcabillot	28e3036f5c	Merge pull request 'fix(ci): correct corrupted anothrNick/github-tag-action SHA' (#19 ) from fix/github-tag-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 11s Details Main Release / tag (push) Successful in 32s Details Tag Release / hadolint (push) Successful in 7s Details Tag Release / test (push) Successful in 14s Details Tag Release / build-push (push) Failing after 30s Details Reviewed-on: #19	2026-06-28 22:14:25 -04:00
cloudix_mcp_server	928aca5505	fix(ci): correct corrupted anothrNick/github-tag-action SHA PR Checks / build-test (pull_request) Successful in 1m59s Details PR Checks / hadolint (pull_request) Successful in 6s Details The SHA in the tag job of main.yaml was corrupted — missing the leading '4' and with mutated bytes in the middle (da04aec3cc → da9f2a04ec). Correct SHA for v1.75.0 is 4ed44965e0db8dab2b466a16da04aec3cc312fd8. Fixes CI run #1981 job #4861: reference not found.	2026-06-28 18:09:15 +00:00
jcabillot	3166943afc	Merge pull request 'chore(deps): update actions/checkout action to v7' (#18 ) from renovate/actions-checkout-7.x into master Main Release / hadolint (push) Successful in 7s Details Main Release / test (push) Successful in 18s Details Main Release / build (push) Successful in 15s Details Main Release / tag (push) Failing after 8s Details Reviewed-on: #18	2026-06-18 16:22:58 -04:00
renovate	1afb8d92c5	chore(deps): update actions/checkout action to v7 PR Checks / hadolint (pull_request) Successful in 7s Details PR Checks / build-test (pull_request) Successful in 14s Details	2026-06-18 15:24:32 +00:00