Update Nginx configuration to use $is_request_port and $request_port for improved compatibility

Signed-off-by: Eric Nemchik <eric@nemchik.com>

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.24
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.22
 
 # set version label
 ARG BUILD_DATE
@@ -49,34 +49,36 @@ RUN \
     nginx-mod-stream \
     nginx-mod-stream-geoip2 \
     nginx-vim \
-    php85-bcmath \
-    php85-bz2 \
-    php85-dom \
-    php85-exif \
-    php85-ftp \
-    php85-gd \
-    php85-gmp \
-    php85-intl \
-    php85-ldap \
-    php85-mysqli \
-    php85-mysqlnd \
-    php85-pdo_mysql \
-    php85-pdo_odbc \
-    php85-pdo_pgsql \
-    php85-pdo_sqlite \
-    php85-pear \
-    php85-pecl-apcu \
-    php85-pecl-memcached \
-    php85-pecl-redis \
-    php85-pgsql \
-    php85-posix \
-    php85-soap \
-    php85-sockets \
-    php85-sodium \
-    php85-sqlite3 \
-    php85-tokenizer \
-    php85-xmlreader \
-    php85-xsl \
+    php84-bcmath \
+    php84-bz2 \
+    php84-dom \
+    php84-exif \
+    php84-ftp \
+    php84-gd \
+    php84-gmp \
+    php84-imap \
+    php84-intl \
+    php84-ldap \
+    php84-mysqli \
+    php84-mysqlnd \
+    php84-opcache \
+    php84-pdo_mysql \
+    php84-pdo_odbc \
+    php84-pdo_pgsql \
+    php84-pdo_sqlite \
+    php84-pear \
+    php84-pecl-apcu \
+    php84-pecl-memcached \
+    php84-pecl-redis \
+    php84-pgsql \
+    php84-posix \
+    php84-soap \
+    php84-sockets \
+    php84-sodium \
+    php84-sqlite3 \
+    php84-tokenizer \
+    php84-xmlreader \
+    php84-xsl \
     whois && \
   echo "**** install certbot plugins ****" && \
   if [ -z ${CERTBOT_VERSION+x} ]; then \
@@ -86,7 +88,7 @@ RUN \
   pip install -U --no-cache-dir \
     pip \
     wheel && \
-  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.24/ \
+  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.22/ \
     certbot==${CERTBOT_VERSION} \
     certbot-dns-acmedns \
     certbot-dns-aliyun \

Dockerfile.aarch64

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.24
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.22
 
 # set version label
 ARG BUILD_DATE
@@ -49,34 +49,36 @@ RUN \
     nginx-mod-stream \
     nginx-mod-stream-geoip2 \
     nginx-vim \
-    php85-bcmath \
-    php85-bz2 \
-    php85-dom \
-    php85-exif \
-    php85-ftp \
-    php85-gd \
-    php85-gmp \
-    php85-intl \
-    php85-ldap \
-    php85-mysqli \
-    php85-mysqlnd \
-    php85-pdo_mysql \
-    php85-pdo_odbc \
-    php85-pdo_pgsql \
-    php85-pdo_sqlite \
-    php85-pear \
-    php85-pecl-apcu \
-    php85-pecl-memcached \
-    php85-pecl-redis \
-    php85-pgsql \
-    php85-posix \
-    php85-soap \
-    php85-sockets \
-    php85-sodium \
-    php85-sqlite3 \
-    php85-tokenizer \
-    php85-xmlreader \
-    php85-xsl \
+    php84-bcmath \
+    php84-bz2 \
+    php84-dom \
+    php84-exif \
+    php84-ftp \
+    php84-gd \
+    php84-gmp \
+    php84-imap \
+    php84-intl \
+    php84-ldap \
+    php84-mysqli \
+    php84-mysqlnd \
+    php84-opcache \
+    php84-pdo_mysql \
+    php84-pdo_odbc \
+    php84-pdo_pgsql \
+    php84-pdo_sqlite \
+    php84-pear \
+    php84-pecl-apcu \
+    php84-pecl-memcached \
+    php84-pecl-redis \
+    php84-pgsql \
+    php84-posix \
+    php84-soap \
+    php84-sockets \
+    php84-sodium \
+    php84-sqlite3 \
+    php84-tokenizer \
+    php84-xmlreader \
+    php84-xsl \
     whois && \
   echo "**** install certbot plugins ****" && \
   if [ -z ${CERTBOT_VERSION+x} ]; then \
@@ -86,7 +88,7 @@ RUN \
   pip install -U --no-cache-dir \
     pip \
     wheel && \
-  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.24/ \
+  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.22/ \
     certbot==${CERTBOT_VERSION} \
     certbot-dns-acmedns \
     certbot-dns-aliyun \

readme-vars.yml

@@ -220,7 +220,6 @@ init_diagram: |
   "swag:latest" <- Base Images
 # changelog
 changelogs:
-  - {date: "19.07.26:", desc: "Rebase to Alpine 3.24 with PHP 8.5."}
   - {date: "10.07.26:", desc: "Add support for Let's Encrypt cert profiles. Run certbot twice daily with a random delay."}
   - {date: "19.06.26:", desc: "Add support for mijn.host dns validation."}
   - {date: "01.06.26:", desc: "Remove obsolete old cert check logic."}

root/defaults/nginx/authelia-server.conf.sample

@@ -1,4 +1,4 @@
-## Version 2025/03/25 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/authelia-server.conf.sample
+## Version 2026/07/18 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/authelia-server.conf.sample
 # Make sure that your authelia container is in the same user defined bridge network and is named authelia
 # Rename /config/nginx/proxy-confs/authelia.subdomain.conf.sample to /config/nginx/proxy-confs/authelia.subdomain.conf
 
@@ -28,7 +28,7 @@ location @authelia_proxy_signin {
     add_header Set-Cookie $set_cookie;
 
     ## Set the $target_url variable based on the original request
-    set_escape_uri $target_url $scheme://$http_host$request_uri;
+    set_escape_uri $target_url $scheme://$host$is_request_port$request_port$request_uri;
 
     ## Translate the Location response header from the auth subrequest into a variable
     auth_request_set $signin_url $upstream_http_location;

root/defaults/nginx/authentik-server.conf.sample

@@ -1,4 +1,4 @@
-## Version 2025/03/25 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/authentik-server.conf.sample
+## Version 2026/07/18 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/authentik-server.conf.sample
 # Make sure that your authentik container is in the same user defined bridge network and is named authentik-server
 # Rename /config/nginx/proxy-confs/authentik.subdomain.conf.sample to /config/nginx/proxy-confs/authentik.subdomain.conf
 
@@ -38,10 +38,10 @@ location @goauthentik_proxy_signin {
     add_header Set-Cookie $set_cookie;
 
     ## Set the $target_url variable based on the original request
-    set_escape_uri $target_url $scheme://$http_host$request_uri;
+    set_escape_uri $target_url $scheme://$host$is_request_port$request_port$request_uri;
 
     ## Set the $signin_url variable
-    set $signin_url https://$http_host/outpost.goauthentik.io/start?rd=$target_url;
+    set $signin_url https://$host$is_request_port$request_port/outpost.goauthentik.io/start?rd=$target_url;
 
     ## Redirect to login
     return 302 $signin_url;

root/defaults/nginx/proxy.conf.sample

@@ -1,4 +1,4 @@
-## Version 2023/02/09 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/proxy.conf.sample
+## Version 2026/07/18 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/proxy.conf.sample
 
 # Timeout if the real server is dead
 proxy_next_upstream error timeout invalid_header http_500 http_502 http_503;
@@ -21,11 +21,11 @@ proxy_no_cache $cookie_session;
 # Proxy Header Settings
 proxy_set_header Connection $connection_upgrade;
 proxy_set_header Early-Data $ssl_early_data;
-proxy_set_header Host $host;
+proxy_set_header Host $host$is_request_port$request_port;
 proxy_set_header Proxy "";
 proxy_set_header Upgrade $http_upgrade;
 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-proxy_set_header X-Forwarded-Host $host;
+proxy_set_header X-Forwarded-Host $host$is_request_port$request_port;
 proxy_set_header X-Forwarded-Method $request_method;
 proxy_set_header X-Forwarded-Port $server_port;
 proxy_set_header X-Forwarded-Proto $scheme;
@@ -33,5 +33,5 @@ proxy_set_header X-Forwarded-Server $host;
 proxy_set_header X-Forwarded-Ssl on;
 proxy_set_header X-Forwarded-Uri $request_uri;
 proxy_set_header X-Original-Method $request_method;
-proxy_set_header X-Original-URL $scheme://$http_host$request_uri;
+proxy_set_header X-Original-URL $scheme://$host$is_request_port$request_port$request_uri;
 proxy_set_header X-Real-IP $remote_addr;

root/defaults/nginx/tinyauth-server.conf.sample

@@ -1,4 +1,4 @@
-## Version 2025/06/08 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/tinyauth-server.conf.sample
+## Version 2026/07/18 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/tinyauth-server.conf.sample
 # Make sure that your tinyauth container is in the same user defined bridge network and is named tinyauth
 # Rename /config/nginx/proxy-confs/tinyauth.subdomain.conf.sample to /config/nginx/proxy-confs/tinyauth.subdomain.conf
 
@@ -12,7 +12,7 @@ location /tinyauth {
     proxy_pass http://$upstream_tinyauth:3000/api/auth/nginx;
 
     proxy_set_header x-forwarded-proto $scheme;
-    proxy_set_header x-forwarded-host $http_host;
+    proxy_set_header x-forwarded-host $host$is_request_port$request_port;
     proxy_set_header x-forwarded-uri $request_uri;
 }
 
@@ -21,8 +21,8 @@ location @tinyauth_login {
     internal;
 
     ## Set the $target_url variable based on the original request
-    set_escape_uri $target_url $scheme://$http_host$request_uri;
-    
+    set_escape_uri $target_url $scheme://$host$is_request_port$request_port$request_uri;
+
     ## Set the $signin_url variable
     set $domain $host;
     if ($host ~* "^[^.]+\.([^.]+\..+)$") {