From 8f8fa08aa2e2fc8c1fff61b0c2562a36b43e7da0 Mon Sep 17 00:00:00 2001
From: thespad <spad@linuxserver.io>
Date: Wed, 9 Jul 2025 22:16:16 +0100
Subject: [PATCH] Rebase to 3.22

---
 .editorconfig                                 |  0
 .github/ISSUE_TEMPLATE/issue.bug.yml          |  0
 .github/ISSUE_TEMPLATE/issue.feature.yml      |  0
 .github/workflows/call_issue_pr_tracker.yml   |  0
 .github/workflows/call_issues_cron.yml        |  0
 .github/workflows/permissions.yml             |  0
 Dockerfile                                    | 20 +++++++++----------
 Dockerfile.aarch64                            | 20 +++++++++----------
 .../nginx/site-confs/default.conf.sample      |  4 +++-
 9 files changed, 23 insertions(+), 21 deletions(-)
 mode change 100755 => 100644 .editorconfig
 mode change 100755 => 100644 .github/ISSUE_TEMPLATE/issue.bug.yml
 mode change 100755 => 100644 .github/ISSUE_TEMPLATE/issue.feature.yml
 mode change 100755 => 100644 .github/workflows/call_issue_pr_tracker.yml
 mode change 100755 => 100644 .github/workflows/call_issues_cron.yml
 mode change 100755 => 100644 .github/workflows/permissions.yml

diff --git a/.editorconfig b/.editorconfig
old mode 100755
new mode 100644
diff --git a/.github/ISSUE_TEMPLATE/issue.bug.yml b/.github/ISSUE_TEMPLATE/issue.bug.yml
old mode 100755
new mode 100644
diff --git a/.github/ISSUE_TEMPLATE/issue.feature.yml b/.github/ISSUE_TEMPLATE/issue.feature.yml
old mode 100755
new mode 100644
diff --git a/.github/workflows/call_issue_pr_tracker.yml b/.github/workflows/call_issue_pr_tracker.yml
old mode 100755
new mode 100644
diff --git a/.github/workflows/call_issues_cron.yml b/.github/workflows/call_issues_cron.yml
old mode 100755
new mode 100644
diff --git a/.github/workflows/permissions.yml b/.github/workflows/permissions.yml
old mode 100755
new mode 100644
diff --git a/Dockerfile b/Dockerfile
index 3d7d921..4271b20 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.20
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.22
 
 # set version label
 ARG BUILD_DATE
@@ -12,15 +12,15 @@ LABEL maintainer="gilbn"
 RUN \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
-    php83-ftp \
-    php83-gd \
-    php83-intl \
-    php83-ldap \
-    php83-mysqli \
-    php83-pdo_mysql \
-    php83-pdo_sqlite \
-    php83-sqlite3 \
-    php83-tokenizer && \
+    php84-ftp \
+    php84-gd \
+    php84-intl \
+    php84-ldap \
+    php84-mysqli \
+    php84-pdo_mysql \
+    php84-pdo_sqlite \
+    php84-sqlite3 \
+    php84-tokenizer && \
   echo "**** install xbackbone ****" && \
     mkdir -p /app/www/public && \
   if [ -z ${XBACKBONE_RELEASE+x} ]; then \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 39e529e..2f50421 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.20
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.22
 
 # set version label
 ARG BUILD_DATE
@@ -12,15 +12,15 @@ LABEL maintainer="gilbn"
 RUN \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
-    php83-ftp \
-    php83-gd \
-    php83-intl \
-    php83-ldap \
-    php83-mysqli \
-    php83-pdo_mysql \
-    php83-pdo_sqlite \
-    php83-sqlite3 \
-    php83-tokenizer && \
+    php84-ftp \
+    php84-gd \
+    php84-intl \
+    php84-ldap \
+    php84-mysqli \
+    php84-pdo_mysql \
+    php84-pdo_sqlite \
+    php84-sqlite3 \
+    php84-tokenizer && \
   echo "**** install xbackbone ****" && \
     mkdir -p /app/www/public && \
   if [ -z ${XBACKBONE_RELEASE+x} ]; then \
diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample
index a4e1381..fc244d6 100644
--- a/root/defaults/nginx/site-confs/default.conf.sample
+++ b/root/defaults/nginx/site-confs/default.conf.sample
@@ -1,10 +1,12 @@
-## Version 2024/07/16 - Changelog: https://github.com/linuxserver/docker-xbackbone/commits/main/root/defaults/nginx/site-confs/default.conf.sample
+## Version 2025/07/09 - Changelog: https://github.com/linuxserver/docker-xbackbone/commits/main/root/defaults/nginx/site-confs/default.conf.sample
 
 server {
     listen 80 default_server;
     listen [::]:80 default_server;
     listen 443 ssl default_server;
     listen [::]:443 ssl default_server;
+    listen 443 quic reuseport default_server;
+    listen [::]:443 quic reuseport default_server;
 
     server_name _;