chore(deps): update actions/checkout action to v7

.gitea/workflows/cron.yaml

@@ -1,49 +1,38 @@
 name: Nightly Rebuild
+
 on:
   schedule:
     - cron: '0 0 * * *'
+
 jobs:
   hadolint:
     runs-on: ubuntu-latest
+    continue-on-error: true
     steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
       - uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
-        continue-on-error: true
         with:
           dockerfile: Dockerfile
-  test:
+
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-      - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
-      - run: docker build --load -t ci-image:${{ github.sha }} .
-      - run: bash tests/test.sh ci-image:${{ github.sha }}
   build-push:
-    needs: [test]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
-        with:
-          fetch-depth: 0
       - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
       - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - id: get-latest-tag
-        run: |
-          TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "")
-          echo "tag=$TAG" >> $GITHUB_OUTPUT
       - id: meta
         uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6
         with:
           images: jcabillot/rssbridge
           tags: |
-            type=raw,value=${{ steps.get-latest-tag.outputs.tag }}-latest,enable=${{ steps.get-latest-tag.outputs.tag != '' }}
+            type=raw,value=nightly
+            type=sha
       - uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
         with:
           context: .
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          pull: true

.gitea/workflows/main.yaml

@@ -1,44 +1,38 @@
 name: Main Release
+
 on:
   push:
     branches: [master]
+
 jobs:
   hadolint:
     runs-on: ubuntu-latest
+    continue-on-error: true
     steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
       - uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
-        continue-on-error: true
         with:
           dockerfile: Dockerfile
-  test:
+
+  build-push:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
       - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
-      - run: docker build --load -t ci-image:${{ github.sha }} .
+      - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
-      - run: bash tests/test.sh ci-image:${{ github.sha }}
-  build:
-    needs: [test]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-      - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
-      - run: docker build -t jcabillot/rssbridge:${{ github.sha }} .
-  tag:
-    needs: [build]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
         with:
-          fetch-depth: 0
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
-      - name: Configure git auth
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
-        run: |
+      - id: meta
-          git remote set-url origin "https://x-access-token:${{ secrets.SA_TOKEN_ACTION_PUSH_TAGS }}@scm.cabillot.eu/web/rssbridge.git"
+        uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6
-      - uses: anothrNick/github-tag-action@4ed44965e0db8dab2b466a16da04aec3cc312fd8 # v1.75.0
+        with:
-        env:
+          images: jcabillot/rssbridge
-          GITHUB_TOKEN: ${{ secrets.SA_TOKEN_ACTION_PUSH_TAGS }}
+          tags: |
-          DEFAULT_BUMP: patch
+            type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }}
-          RELEASE_BRANCHES: master
+            type=sha
-          WITH_V: true
+      - uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
-          GIT_API_TAGGING: false
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.gitea/workflows/pr.yaml

@@ -1,20 +1,15 @@
 name: PR Checks
+
 on:
   pull_request:
     branches: [master]
+
 jobs:
   hadolint:
     runs-on: ubuntu-latest
+    continue-on-error: true
     steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
       - uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
-        continue-on-error: true
         with:
           dockerfile: Dockerfile
-  build-test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-      - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
-      - run: docker build --load -t ci-image:${{ github.sha }} .
-      - run: bash tests/test.sh ci-image:${{ github.sha }}

.gitea/workflows/tag.yaml

@@ -1,44 +1,21 @@
 name: Tag Release
+
 on:
   push:
-    tags: ['*']
+    branches: [master]
+
 jobs:
-  hadolint:
+  tag:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
-      - uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
-        continue-on-error: true
         with:
-          dockerfile: Dockerfile
+          fetch-depth: 0
-  test:
+      - name: Bump version and push tag
-    runs-on: ubuntu-latest
+        uses: anothrNick/github-tag-action@4ed44965e0db8dab2b466a16da04aec3cc312fd8 # v1
-    steps:
+        env:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
+          DEFAULT_BUMP: patch
-      - run: docker build --load -t ci-image:${{ github.sha }} .
+          RELEASE_BRANCHES: master
-      - run: bash tests/test.sh ci-image:${{ github.sha }}
+          WITH_V: true
-  build-push:
+          GIT_API_TAGGING: false
-    needs: [test]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
-      - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
-      - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - id: meta
-        uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6
-        with:
-          images: jcabillot/rssbridge
-          tags: |
-            type=ref,event=tag
-            type=ref,event=tag,suffix=-latest
-      - uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
-        with:
-          context: .
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          pull: true

Caddyfile

@@ -1,11 +0,0 @@
-{
-    auto_https off
-    frankenphp
-}
-
-:8080 {
-    root * /app/public
-    encode zstd br gzip
-    try_files {path} /index.php?{query}
-    php_server
-}

Dockerfile

@@ -1,22 +1,10 @@
-FROM dunglas/frankenphp:1-php8.5-alpine
+ARG  VERSION="latest"
+FROM "jcabillot/phpapache:${VERSION}"
 LABEL maintainer="Julien Cabillot <dockerimages@cabillot.eu>"
 
-WORKDIR /app
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+RUN curl -s -L "https://github.com/RSS-Bridge/rss-bridge/tarball/master/" | tar -zx --strip=1
 
-# Install required PHP extensions for RSS-Bridge
+RUN echo "*" > "/var/www/html/whitelist.txt" && \
-RUN install-php-extensions mbstring simplexml curl json iconv
+    mkdir -p /var/www/html/cache && \
-
+    chown -R www-data:www-data /var/www/html
-COPY Caddyfile /etc/frankenphp/Caddyfile
-
-# Download RSS-Bridge (two-step to avoid pipefail dependency)
-RUN curl -s -L "https://github.com/RSS-Bridge/rss-bridge/tarball/master/" -o /tmp/rssbridge.tar && \
-    tar -zx --strip=1 -C /app/public -f /tmp/rssbridge.tar && \
-    rm /tmp/rssbridge.tar
-
-# Configure RSS-Bridge
-RUN echo "*" > "/app/public/whitelist.txt" && \
-    mkdir -p /app/public/cache && \
-    chown -R www-data:www-data /app/public && \
-    chmod -R 775 /app/public/cache
-
-USER www-data

renovate.json

@@ -0,0 +1,17 @@
+{
+  "$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"
+    }
+  ]
+}