5 Commits

Author SHA1 Message Date
Sagent 620ac41865 fix: remove bash SHELL directive incompatible with Alpine FrankenPHP
PR Checks / hadolint (pull_request) Failing after 10m25s
2026-06-29 13:37:06 +00:00
jcabillot 07c24eed7c Merge pull request 'fix: migrate from jcabillot/phpapache to dunglas/frankenphp' (#10) from fix/frankenphp-migration into master
Main Release / hadolint (push) Successful in 11s
Tag Release / tag (push) Failing after 14s
Main Release / build-push (push) Failing after 40s
Reviewed-on: #10
2026-06-29 09:32:53 -04:00
Sagent 699acc8684 fix: migrate from jcabillot/phpapache to dunglas/frankenphp
PR Checks / hadolint (pull_request) Successful in 6s
2026-06-29 12:50:57 +00:00
jcabillot 5b25487d48 Merge pull request 'chore(deps): update actions/checkout action to v7' (#9) from renovate/actions-checkout-7.x into master
Main Release / hadolint (push) Successful in 10s
Main Release / build-push (push) Successful in 57s
Tag Release / tag (push) Failing after 13m29s
Reviewed-on: #9
2026-06-18 16:22:12 -04:00
renovate 66ad6462b0 chore(deps): update actions/checkout action to v7
PR Checks / hadolint (pull_request) Successful in 7s
2026-06-18 15:34:26 +00:00
6 changed files with 37 additions and 13 deletions
+2 -2
View File
@@ -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:
build-push:
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@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
with:
+2 -2
View File
@@ -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:
build-push:
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@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
with:
+1 -1
View File
@@ -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
+1 -1
View File
@@ -8,7 +8,7 @@ jobs:
tag:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
with:
fetch-depth: 0
- name: Bump version and push tag
+11
View File
@@ -0,0 +1,11 @@
{
auto_https off
frankenphp
}
:8080 {
root * /app/public
encode zstd br gzip
try_files {path} /index.php?{query}
php_server
}
+20 -7
View File
@@ -1,10 +1,23 @@
ARG VERSION="latest"
FROM "jcabillot/phpapache:${VERSION}"
FROM dunglas/frankenphp:1-php8.5-alpine
LABEL maintainer="Julien Cabillot <dockerimages@cabillot.eu>"
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN curl -s -L "https://github.com/RSS-Bridge/rss-bridge/tarball/master/" | tar -zx --strip=1
WORKDIR /app
RUN echo "*" > "/var/www/html/whitelist.txt" && \
mkdir -p /var/www/html/cache && \
chown -R www-data:www-data /var/www/html
# Install required PHP extensions for RSS-Bridge
RUN install-php-extensions mbstring simplexml curl json iconv
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
RUN chown www-data:www-data /data/caddy && chmod 2770 /data/caddy
USER www-data