Rebase to 3.22, switch to php84, enable http3

Author: thespad

.editorconfig

@@ -26,7 +26,7 @@ jobs:
           echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
           echo "> External trigger running off of master branch. To disable this trigger, add \`baseimage-alpine-nginx_master\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
           printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
-          EXT_RELEASE=$(echo $(curl -sL http://dl-cdn.alpinelinux.org/alpine/v3.21/main/x86_64/APKINDEX.tar.gz | tar -xz -C /tmp && awk '/^P:'"nginx"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')_$(curl -sL http://dl-cdn.alpinelinux.org/alpine/v3.21/community/x86_64/APKINDEX.tar.gz | tar -xz -C /tmp && awk '/^P:'"php83"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'))
+          EXT_RELEASE=$(echo $(curl -sL http://dl-cdn.alpinelinux.org/alpine/v3.22/main/x86_64/APKINDEX.tar.gz | tar -xz -C /tmp && awk '/^P:'"nginx"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')_$(curl -sL http://dl-cdn.alpinelinux.org/alpine/v3.22/community/x86_64/APKINDEX.tar.gz | tar -xz -C /tmp && awk '/^P:'"php84"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'))
           echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY
           if grep -q "^baseimage-alpine-nginx_master_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
             echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
@@ -47,7 +47,7 @@ jobs:
           echo "External version: \`${EXT_RELEASE}\`" >> $GITHUB_STEP_SUMMARY
           echo "Retrieving last pushed version" >> $GITHUB_STEP_SUMMARY
           image="linuxserver/baseimage-alpine-nginx"
-          tag="3.21"
+          tag="3.22"
           token=$(curl -sX GET \
             "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fbaseimage-alpine-nginx%3Apull" \
             | jq -r '.token')
@@ -93,7 +93,7 @@ jobs:
           if [ -z "${IMAGE_VERSION}" ]; then
             echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
             echo "Can't retrieve last pushed version, exiting" >> $GITHUB_STEP_SUMMARY
-            FAILURE_REASON="Can't retrieve last pushed version for baseimage-alpine-nginx tag 3.21"
+            FAILURE_REASON="Can't retrieve last pushed version for baseimage-alpine-nginx tag 3.22"
             curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
               "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
               "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
@@ -110,7 +110,7 @@ jobs:
             if [[ "${artifacts_found}" == "false" ]]; then
               echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
               echo "> New version detected, but not all artifacts are published yet; skipping trigger" >> $GITHUB_STEP_SUMMARY
-              FAILURE_REASON="New version ${EXT_RELEASE} for baseimage-alpine-nginx tag 3.21 is detected, however not all artifacts are uploaded to upstream release yet. Will try again later."
+              FAILURE_REASON="New version ${EXT_RELEASE} for baseimage-alpine-nginx tag 3.22 is detected, however not all artifacts are uploaded to upstream release yet. Will try again later."
               curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
                 "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
                 "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
@@ -136,7 +136,7 @@ jobs:
                 --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
                 --data-urlencode "Submit=Submit"
               echo "**** Notifying Discord ****"
-              TRIGGER_REASON="A version change was detected for baseimage-alpine-nginx tag 3.21. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
+              TRIGGER_REASON="A version change was detected for baseimage-alpine-nginx tag 3.22. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
               curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
                 "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
                 "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}

.github/CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:3.21
+FROM ghcr.io/linuxserver/baseimage-alpine:3.22
 
 # set version label
 ARG BUILD_DATE
@@ -20,22 +20,22 @@ RUN \
     nano \
     nginx \
     openssl \
-    php83 \
-    php83-ctype \
-    php83-curl \
-    php83-fileinfo \
-    php83-fpm \
-    php83-iconv \
-    php83-json \
-    php83-mbstring \
-    php83-openssl \
-    php83-phar \
-    php83-session \
-    php83-simplexml \
-    php83-xml \
-    php83-xmlwriter \
-    php83-zip \
-    php83-zlib && \
+    php84 \
+    php84-ctype \
+    php84-curl \
+    php84-fileinfo \
+    php84-fpm \
+    php84-iconv \
+    php84-json \
+    php84-mbstring \
+    php84-openssl \
+    php84-phar \
+    php84-session \
+    php84-simplexml \
+    php84-xml \
+    php84-xmlwriter \
+    php84-zip \
+    php84-zlib && \
   echo "**** configure nginx ****" && \
   echo 'fastcgi_param  HTTP_PROXY         ""; # https://httpoxy.org/' >> \
     /etc/nginx/fastcgi_params && \
@@ -48,19 +48,19 @@ RUN \
   rm -f /etc/nginx/conf.d/stream.conf && \
   rm -f /etc/nginx/http.d/default.conf && \
   echo "**** guarantee correct php version is symlinked ****" && \
-  if [ "$(readlink /usr/bin/php)" != "php83" ]; then \
+  if [ "$(readlink /usr/bin/php)" != "php84" ]; then \
     rm -rf /usr/bin/php && \
-    ln -s /usr/bin/php83 /usr/bin/php; \
+    ln -s /usr/bin/php84 /usr/bin/php; \
   fi && \
   echo "**** configure php ****" && \
-  sed -i "s#;error_log = log/php83/error.log.*#error_log = /config/log/php/error.log#g" \
-    /etc/php83/php-fpm.conf && \
+  sed -i "s#;error_log = log/php84/error.log.*#error_log = /config/log/php/error.log#g" \
+    /etc/php84/php-fpm.conf && \
   sed -i "s#user = nobody.*#user = abc#g" \
-    /etc/php83/php-fpm.d/www.conf && \
+    /etc/php84/php-fpm.d/www.conf && \
   sed -i "s#group = nobody.*#group = abc#g" \
-    /etc/php83/php-fpm.d/www.conf && \
+    /etc/php84/php-fpm.d/www.conf && \
   echo "**** add run paths to php runtime config ****" && \
-  grep -qxF 'include=/config/php/*.conf' /etc/php83/php-fpm.conf || echo 'include=/config/php/*.conf' >> /etc/php83/php-fpm.conf && \
+  grep -qxF 'include=/config/php/*.conf' /etc/php84/php-fpm.conf || echo 'include=/config/php/*.conf' >> /etc/php84/php-fpm.conf && \
   echo "**** install php composer ****" && \
   EXPECTED_CHECKSUM="$(php -r 'copy("https://composer.github.io/installer.sig", "php://stdout");')" && \
   php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \