2 Commits

Author SHA1 Message Date
jcabillot 3e5a12c827 Merge pull request 'fix: migrate from jcabillot/phpapache to dunglas/frankenphp' (#12) from fix/frankenphp-migration into master
Main Release / hadolint (push) Successful in 9s
Main Release / test (push) Successful in 17s
Main Release / build (push) Successful in 13s
Main Release / tag (push) Successful in 13s
Tag Release / test (push) Successful in 17s
Tag Release / build-push (push) Successful in 53s
Tag Release / hadolint (push) Successful in 10s
Reviewed-on: #12
2026-06-29 09:06:59 -04:00
Sagent 7b8caa0463 fix: migrate from jcabillot/phpapache to dunglas/frankenphp
PR Checks / build-test (pull_request) Successful in 21s
PR Checks / hadolint (pull_request) Successful in 9s
2026-06-29 12:50:41 +00:00
3 changed files with 26 additions and 6 deletions
-1
View File
@@ -6,6 +6,5 @@
:8080 {
root * /app/public
encode zstd br gzip
php_server
file_server
}
+15 -1
View File
@@ -1,3 +1,17 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json"
"$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"
}
]
}
+11 -4
View File
@@ -58,10 +58,17 @@ done
echo ""
echo "Test: GET / (HTML redirect)"
RESPONSE=$(curl -sf -D - "$BASE_URL/")
STATUS=$(echo "$RESPONSE" | head -1 | grep -oP '\d{3}')
CONTENT_TYPE=$(echo "$RESPONSE" | grep -i 'content-type' | tr -d '\r' | cut -d: -f2- | xargs)
BODY=$(echo "$RESPONSE" | sed -n '/^\r$/,$p' | tail -n +2)
# Use temp file to avoid pipefail/SIGPIPE issues
TMPDIR=$(mktemp -d)
cleanup() {
docker rm -f "$CONTAINER_NAME" >/dev/null 2>&1 || true
rm -rf "$TMPDIR"
}
curl -sf -o "$TMPDIR/body" -D "$TMPDIR/headers" "$BASE_URL/"
STATUS=$(head -1 "$TMPDIR/headers" | grep -oP '\d{3}')
CONTENT_TYPE=$(grep -i 'content-type' "$TMPDIR/headers" | tr -d '\r' | cut -d: -f2- | xargs)
BODY=$(cat "$TMPDIR/body")
trap cleanup EXIT
assert "HTTP status is 200" "200" "$STATUS"
assert_match "Content-Type is text/html" "text/html" "$CONTENT_TYPE"