From f0777c27700961d1b630d2587c1255c9f43893c1 Mon Sep 17 00:00:00 2001
From: Christian Winther <jippignu@gmail.com>
Date: Mon, 20 Jan 2025 10:51:55 +0000
Subject: [PATCH] feat: build pixelfed for php 8.4

---
 .github/workflows/docker-release.yml          |  1 +
 .github/workflows/docker-test.yml             |  1 +
 compose.override.yaml                         | 26 +++++++++++++++++++
 .../nginx/docker/templates/var/www/Procfile   |  2 ++
 docker/rootfs/nginx/var/www/Procfile          |  2 --
 5 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 compose.override.yaml
 create mode 100644 docker/rootfs/nginx/docker/templates/var/www/Procfile
 delete mode 100644 docker/rootfs/nginx/var/www/Procfile

diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
index 1c525e5c..0d7dc6f3 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -18,6 +18,7 @@ jobs:
       matrix:
         php_version:
           - 8.3
+          - 8.4
         debian_release:
           - bookworm
         php_base:
diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml
index f7a108c2..09a69ec5 100644
--- a/.github/workflows/docker-test.yml
+++ b/.github/workflows/docker-test.yml
@@ -71,6 +71,7 @@ jobs:
       matrix:
         php_version:
           - 8.3
+          - 8.4
         pixelfed_branch:
           - staging
           - dev
diff --git a/compose.override.yaml b/compose.override.yaml
new file mode 100644
index 00000000..c44bf6d7
--- /dev/null
+++ b/compose.override.yaml
@@ -0,0 +1,26 @@
+---
+include:
+  - path:
+    # Uncomment to add support for [docker compose build] for local images.
+    # - compose-config/build.yaml
+
+    # Uncomment to add nginx proxy in front of the [web] container.
+    # - compose-config/proxy/service.yaml
+
+    # Uncomment to add nginx acme (LetsEncrypt) support to [proxy] container.
+    # - compose-config/proxy/acme.yaml
+
+    # Uncomment to expose [web] container to the host directly.
+    # - compose-config/web/expose.yaml
+
+    # Comment to disable the included [redis] service.
+    - compose-config/redis/service.yaml
+
+    # Uncomment to expose the [redis] server to the host directly.
+    # - compose-config/redis/expose.yaml
+
+    # Comment to disable the included [db] service.
+    - compose-config/db/service.yaml
+
+    # Uncomment to expose the [db] server to the host directly.
+    # - compose-config/db/expose.yaml
diff --git a/docker/rootfs/nginx/docker/templates/var/www/Procfile b/docker/rootfs/nginx/docker/templates/var/www/Procfile
new file mode 100644
index 00000000..e7051082
--- /dev/null
+++ b/docker/rootfs/nginx/docker/templates/var/www/Procfile
@@ -0,0 +1,2 @@
+fpm: php-fpm{{ getenv "PHP_VERSION" }}
+nginx: nginx -g "daemon off;"
diff --git a/docker/rootfs/nginx/var/www/Procfile b/docker/rootfs/nginx/var/www/Procfile
deleted file mode 100644
index d3282791..00000000
--- a/docker/rootfs/nginx/var/www/Procfile
+++ /dev/null
@@ -1,2 +0,0 @@
-fpm: php-fpm8.3
-nginx: nginx -g "daemon off;"