Skip to content

Commit

Permalink
feat: build pixelfed for php 8.4 (#106)
Browse files Browse the repository at this point in the history
* Copy PHP config into 8.4 folders
* Templateize the FPM / Procfile to be PHP version agnostic
* Increase CI PHP memory limit to 256M to work around
pixelfed/pixelfed#5540
* Update docs to reflect 8.4 is available

Not changing default to 8.4 yet, as it need some real life testing first
  • Loading branch information
jippi authored Jan 21, 2025
1 parent c13cc6e commit 9957a68
Show file tree
Hide file tree
Showing 16 changed files with 6,408 additions and 13 deletions.
1 change: 0 additions & 1 deletion .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
{
matchPackageNames: ["php"],
groupName: "PHP",
allowedVersions: "<=8.3",
automerge: false,
},
{
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/docker-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ jobs:
matrix:
php_version:
- 8.3
- 8.4
debian_release:
- bookworm
php_base:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/docker-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ jobs:
matrix:
php_version:
- 8.3
- 8.4
pixelfed_branch:
- staging
- dev
Expand Down Expand Up @@ -173,6 +174,7 @@ jobs:
run: docker/tests/setup.sh
env:
CI: true
DOCKER_APP_PHP_VERSION: "${{ matrix.php_version }}"
DOCKER_APP_TAG: "${{ steps.meta.outputs.version }}"

# goss validate the image
Expand Down
3 changes: 3 additions & 0 deletions docker/.env.testing
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,6 @@ CS_UNLISTED_DOMAINS='example.org,example.net,example.com'
#HORIZON_EMBED=false # Single Docker Container mode

ENABLE_CONFIG_CACHE=false

# Increase memory limit for import cities under PHP 8.4
DOCKER_APP_PHP_MEMORY_LIMIT="256M"
2 changes: 1 addition & 1 deletion docker/goss.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ command:
# Security: not expose PHP information to users
- expose_php => Off => Off
# Ensure memory limit is configured correctly
- memory_limit => 128M => 128M
- memory_limit => 256M => 256M
# Ensure post_max_size is configured correctly
- post_max_size => 61M => 61M
# EXIF is enabled
Expand Down
Loading

0 comments on commit 9957a68

Please sign in to comment.