deps: update NGINX version to 1.26.3 across Dockerfiles and dependencies

CHANGELOG.md

@@ -5,6 +5,7 @@
 - [AUTOCONF] Increase retry limit and improve stability of Kubernetes watch stream
 - [UI] Add caching for GitHub buttons to improve performance
 - [UI] Fix shenanigans with multiples
+- [DEPS] Updated NGINX version to `1.26.3` (For now, Fedora 40/41 doesn't support this version and therefor will use the version `1.26.2`)
 - [DEPS] Updated lua-resty-openssl version to 1.5.2
 
 ## v1.6.0-rc4 - 2025/01/29

docs/integrations.md

@@ -328,7 +328,7 @@ Supported Linux distributions for BunkerWeb (amd64/x86_64 and arm64/aarch64 arch
 - Red Hat Enterprise Linux (RHEL) 8.9
 - Red Hat Enterprise Linux (RHEL) 9.4
 
-Please ensure that you have **NGINX 1.26.2 installed before installing BunkerWeb**. For all distributions, except Fedora, it is mandatory to use prebuilt packages from the [official NGINX repository](https://nginx.org/en/linux_packages.html). Compiling NGINX from source or using packages from different repositories will not work with the official prebuilt packages of BunkerWeb. However, you have the option to build BunkerWeb from source.
+Please ensure that you have **NGINX 1.26.3 installed before installing BunkerWeb**. For all distributions, except Fedora, it is mandatory to use prebuilt packages from the [official NGINX repository](https://nginx.org/en/linux_packages.html). Compiling NGINX from source or using packages from different repositories will not work with the official prebuilt packages of BunkerWeb. However, you have the option to build BunkerWeb from source.
 
 === "Debian"
 
@@ -343,11 +343,11 @@ Please ensure that you have **NGINX 1.26.2 installed before installing BunkerWeb
     | sudo tee /etc/apt/sources.list.d/nginx.list
     ```
 
-    You should now be able to install NGINX 1.26.2 :
+    You should now be able to install NGINX 1.26.3 :
 
     ```shell
     sudo apt update && \
-    sudo apt install -y nginx=1.26.2-1~$(lsb_release -cs)
+    sudo apt install -y nginx=1.26.3-1~$(lsb_release -cs)
     ```
 
     !!! warning "Testing/dev version"
@@ -391,11 +391,11 @@ Please ensure that you have **NGINX 1.26.2 installed before installing BunkerWeb
     | sudo tee /etc/apt/sources.list.d/nginx.list
     ```
 
-    You should now be able to install NGINX 1.26.2 :
+    You should now be able to install NGINX 1.26.3 :
 
     ```shell
     sudo apt update && \
-    sudo apt install -y nginx=1.26.2-1~$(lsb_release -cs)
+    sudo apt install -y nginx=1.26.3-1~$(lsb_release -cs)
     ```
 
     !!! warning "Testing/dev version"
@@ -428,12 +428,8 @@ Please ensure that you have **NGINX 1.26.2 installed before installing BunkerWeb
 
 === "Fedora"
 
-    !!! info "Fedora Update Testing"
-        If you can't find the NGINX version listed in the stable repository, you can enable the `updates-testing` repository :
-
-        ```shell
-        sudo dnf config-manager --set-enabled updates-testing
-        ```
+    !!! warning "NGINX 1.26.3"
+        As of the writing of this documentation, the `1.26.3` version of NGINX is not yet available in the official Fedora repositories. So temporarily, you will need to use the version `1.26.2` provided by Fedora.
 
     Fedora already provides NGINX 1.26.2 that we support :
 
@@ -487,10 +483,10 @@ Please ensure that you have **NGINX 1.26.2 installed before installing BunkerWeb
     module_hotfixes=true
     ```
 
-    You should now be able to install NGINX 1.26.2 :
+    You should now be able to install NGINX 1.26.3 :
 
     ```shell
-    sudo dnf install nginx-1.26.2
+    sudo dnf install nginx-1.26.3
     ```
 
     !!! example "Disable the setup wizard"

src/bw/Dockerfile

@@ -1,4 +1,4 @@
-FROM nginx:1.26.2-alpine-slim@sha256:1d541dc68a99c4da7923e88b8e184f85034804a1ff59ee838a81d83c319267d8 AS builder
+FROM nginx:1.26.3-alpine-slim@sha256:e22e10bd833136245b39ffeb1a0d7c672f5597c18df4c462f327cc44fe0aa7a8 AS builder
 
 # Install temporary requirements for the dependencies
 RUN apk add --no-cache bash autoconf libtool automake geoip-dev g++ gcc curl-dev libxml2-dev pcre-dev make linux-headers musl-dev gd-dev gnupg brotli-dev openssl-dev patch readline-dev yajl yajl-dev yajl-tools py3-pip
@@ -42,7 +42,7 @@ COPY src/common/utils utils
 COPY src/VERSION VERSION
 COPY misc/*.ascii misc/
 
-FROM nginx:1.26.2-alpine-slim@sha256:1d541dc68a99c4da7923e88b8e184f85034804a1ff59ee838a81d83c319267d8
+FROM nginx:1.26.3-alpine-slim@sha256:e22e10bd833136245b39ffeb1a0d7c672f5597c18df4c462f327cc44fe0aa7a8
 
 # Set default umask to prevent huge recursive chmod increasing the final image size
 RUN umask 027

src/deps/deps.json

@@ -241,9 +241,9 @@
     },
     {
       "id": "nginx",
-      "name": "Nginx v1.26.2",
+      "name": "Nginx v1.26.3",
       "url": "https://github.com/nginx/nginx.git",
-      "commit": "37fe98355461d2f03d73e6a8e82ac4e4cd85d711",
+      "commit": "1be0fb0c9f9bc3489c7b40576efd6afe6b2eccd5",
       "post_install": "rm -r src/deps/src/nginx/docs"
     },
     {

src/linux/Dockerfile-debian

@@ -1,7 +1,7 @@
 FROM debian:bookworm-slim@sha256:321341744acb788e251ebd374aecc1a42d60ce65da7bd4ee9207ff6be6686a62 AS builder
 
 ENV OS=debian
-ENV NGINX_VERSION=1.26.2
+ENV NGINX_VERSION=1.26.3
 
 # Install Nginx and dependencies
 RUN apt update && \

src/linux/Dockerfile-rhel

@@ -1,7 +1,7 @@
 FROM redhat/ubi8:8.10@sha256:881aaf5fa0d1f85925a1b9668a1fc7f850a11ca30fd3e37ea194db4edff892a5 AS builder
 
 ENV OS=rhel
-ENV NGINX_VERSION=1.26.2
+ENV NGINX_VERSION=1.26.3
 
 # Copy rocky repo
 COPY src/linux/rocky-8.repo /etc/yum.repos.d/rocky.repo
@@ -17,7 +17,7 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-8
 RUN dnf install -y wget make yum-utils && \
   dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \
   dnf install -y --setopt=install_weak_deps=False readline-devel python39 python39-devel python39-setuptools brotli brotli-devel gperftools-devel perl libxslt-devel libxml2 yajl yajl-devel libxslt bash gd gd-devel gcc-c++ curl znc-modtcl gawk libtool pcre-devel automake autoconf gcc make openssl-devel git zlib-devel libxml2-devel pkgconf libcurl-devel geoip-devel && \
-  dnf install -y https://nginx.org/packages/rhel/8/$(uname -m)/RPMS/nginx-${NGINX_VERSION}-1.el8.ngx.$(uname -m).rpm
+  dnf install nginx-${NGINX_VERSION} -y
 
 WORKDIR /tmp/bunkerweb/deps
 

src/linux/Dockerfile-rhel9

@@ -1,7 +1,7 @@
 FROM redhat/ubi9:9.5@sha256:53d6c19d664f4f418ce5c823d3a33dbb562a2550ea249cf07ef10aa063ace38f AS builder
 
 ENV OS=rhel
-ENV NGINX_VERSION=1.26.2
+ENV NGINX_VERSION=1.26.3
 
 # Copy rocky repo
 COPY src/linux/rocky-9.repo /etc/yum.repos.d/rocky.repo
@@ -18,7 +18,7 @@ RUN dnf install -y wget make yum-utils && \
   dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
   dnf install -y --skip-broken --setopt=install_weak_deps=False --nobest openssl-libs openssl-devel && \
   dnf install -y --skip-broken --setopt=install_weak_deps=False readline-devel python39 python3-devel brotli brotli-devel gperftools-devel perl libxslt-devel libxml2 yajl libxslt bash gd gd-devel gcc-c++ znc-modtcl gawk libtool pcre-devel automake autoconf gcc make git zlib-devel libxml2-devel pkgconf libcurl-devel libmaxminddb && \
-  dnf install -y https://nginx.org/packages/rhel/9/$(uname -m)/RPMS/nginx-${NGINX_VERSION}-1.el9.ngx.$(uname -m).rpm
+  dnf install nginx-${NGINX_VERSION} -y
 
 WORKDIR /tmp/bunkerweb/deps
 

src/linux/Dockerfile-ubuntu

@@ -1,7 +1,7 @@
 FROM ubuntu:noble@sha256:72297848456d5d37d1262630108ab308d3e9ec7ed1c3286a32fe09856619a782 AS builder
 
 ENV OS=ubuntu
-ENV NGINX_VERSION=1.26.2
+ENV NGINX_VERSION=1.26.3
 
 # Install Nginx and dependencies
 RUN apt update && \

src/linux/Dockerfile-ubuntu-jammy

@@ -1,7 +1,7 @@
 FROM ubuntu:jammy@sha256:ed1544e454989078f5dec1bfdabd8c5cc9c48e0705d07b678ab6ae3fb61952d2 AS builder
 
 ENV OS=ubuntu
-ENV NGINX_VERSION=1.26.2
+ENV NGINX_VERSION=1.26.3
 
 # Install Nginx and dependencies
 RUN apt update && \

src/linux/fpm-debian

@@ -3,7 +3,7 @@
 --license agpl3
 --version %VERSION%
 --architecture %ARCH%
---depends bash --depends python3 --depends procps --depends python3-pip --depends 'nginx = 1.26.2-1~bookworm' --depends libcurl4 --depends libgeoip-dev --depends libxml2 --depends libyajl2 --depends libmagic1 --depends net-tools --depends sudo --depends lsof --depends libpq5 --depends libpcre3 --depends libcap2-bin --depends logrotate --depends mariadb-client --depends postgresql-client --depends sqlite3 --depends unzip --depends tar
+--depends bash --depends python3 --depends procps --depends python3-pip --depends 'nginx = 1.26.3-1~bookworm' --depends libcurl4 --depends libgeoip-dev --depends libxml2 --depends libyajl2 --depends libmagic1 --depends net-tools --depends sudo --depends lsof --depends libpq5 --depends libpcre3 --depends libcap2-bin --depends logrotate --depends mariadb-client --depends postgresql-client --depends sqlite3 --depends unzip --depends tar
 --description "BunkerWeb %VERSION% for Debian 12"
 --url "https://www.bunkerweb.io"
 --maintainer "Bunkerity <contact at bunkerity dot com>"

src/linux/fpm-rhel

@@ -3,7 +3,7 @@
 --license agpl3
 --version %VERSION%
 --architecture %ARCH%
---depends bash --depends python39 --depends 'nginx >= 1:1.26.2' --depends 'nginx < 1:1.27.0' --depends libcurl-devel --depends libxml2 --depends yajl --depends file-libs --depends net-tools --depends gd --depends sudo --depends procps --depends lsof --depends geoip --depends libpq --depends libcap --depends openssl --depends sqlite --depends unzip --depends tar
+--depends bash --depends python39 --depends 'nginx >= 1:1.26.3' --depends 'nginx < 1:1.27.0' --depends libcurl-devel --depends libxml2 --depends yajl --depends file-libs --depends net-tools --depends gd --depends sudo --depends procps --depends lsof --depends geoip --depends libpq --depends libcap --depends openssl --depends sqlite --depends unzip --depends tar
 --description "BunkerWeb %VERSION% for RHEL 8"
 --url "https://www.bunkerweb.io"
 --maintainer "Bunkerity <contact at bunkerity dot com>"

src/linux/fpm-rhel9

@@ -3,7 +3,7 @@
 --license agpl3
 --version %VERSION%
 --architecture %ARCH%
---depends bash --depends python39 --depends 'nginx >= 1:1.26.2' --depends 'nginx < 1:1.27.0' --depends libcurl-devel --depends libxml2 --depends yajl --depends file-libs --depends net-tools --depends gd --depends sudo --depends procps --depends lsof --depends libmaxminddb --depends libpq --depends libcap --depends openssl --depends mysql --depends postgresql --depends sqlite --depends unzip --depends tar
+--depends bash --depends python39 --depends 'nginx >= 1:1.26.3' --depends 'nginx < 1:1.27.0' --depends libcurl-devel --depends libxml2 --depends yajl --depends file-libs --depends net-tools --depends gd --depends sudo --depends procps --depends lsof --depends libmaxminddb --depends libpq --depends libcap --depends openssl --depends mysql --depends postgresql --depends sqlite --depends unzip --depends tar
 --description "BunkerWeb %VERSION% for RHEL 9"
 --url "https://www.bunkerweb.io"
 --maintainer "Bunkerity <contact at bunkerity dot com>"

src/linux/fpm-ubuntu

@@ -3,7 +3,7 @@
 --license agpl3
 --version %VERSION%
 --architecture %ARCH%
---depends bash --depends python3 --depends python3-pip --depends 'nginx = 1.26.2-1~noble' --depends libcurl4 --depends libgeoip-dev --depends libxml2 --depends libyajl2 --depends libmagic1 --depends net-tools --depends sudo --depends procps --depends lsof --depends libpq5 --depends libcap2-bin --depends logrotate --depends mariadb-client --depends postgresql-client --depends sqlite3 --depends unzip --depends libpcre3 --depends tar
+--depends bash --depends python3 --depends python3-pip --depends 'nginx = 1.26.3-1~noble' --depends libcurl4 --depends libgeoip-dev --depends libxml2 --depends libyajl2 --depends libmagic1 --depends net-tools --depends sudo --depends procps --depends lsof --depends libpq5 --depends libcap2-bin --depends logrotate --depends mariadb-client --depends postgresql-client --depends sqlite3 --depends unzip --depends libpcre3 --depends tar
 --description "BunkerWeb %VERSION% for Ubuntu 24.04"
 --url "https://www.bunkerweb.io"
 --maintainer "Bunkerity <contact at bunkerity dot com>"

src/linux/fpm-ubuntu-jammy

@@ -3,7 +3,7 @@
 --license agpl3
 --version %VERSION%
 --architecture %ARCH%
---depends bash --depends python3 --depends python3-pip --depends 'nginx = 1.26.2-1~jammy' --depends libcurl4 --depends libgeoip-dev --depends libxml2 --depends libyajl2 --depends libmagic1 --depends net-tools --depends sudo --depends procps --depends lsof --depends libpq5 --depends libcap2-bin --depends logrotate --depends mariadb-client --depends postgresql-client --depends sqlite3 --depends unzip --depends libpcre3 --depends tar
+--depends bash --depends python3 --depends python3-pip --depends 'nginx = 1.26.3-1~jammy' --depends libcurl4 --depends libgeoip-dev --depends libxml2 --depends libyajl2 --depends libmagic1 --depends net-tools --depends sudo --depends procps --depends lsof --depends libpq5 --depends libcap2-bin --depends logrotate --depends mariadb-client --depends postgresql-client --depends sqlite3 --depends unzip --depends libpcre3 --depends tar
 --description "BunkerWeb %VERSION% for Ubuntu 22.04"
 --url "https://www.bunkerweb.io"
 --maintainer "Bunkerity <contact at bunkerity dot com>"

tests/Upgrade.py

@@ -4,7 +4,7 @@
 import time
 import pathlib
 
-NGINX_VERSION = "1.26.2"
+NGINX_VERSION = "1.26.3"
 
 distro = sys.argv[1]
 if distro == "ubuntu":
@@ -57,7 +57,7 @@
 
     # Installing test
     print("Installing bunkerweb...")
-    bash_script = """
+    bash_script = f"""
     apt update && apt install -y sudo && \
     sudo apt install -y curl gnupg2 ca-certificates lsb-release ubuntu-keyring && \
     curl https://nginx.org/keys/nginx_signing.key | gpg --dearmor \
@@ -66,7 +66,7 @@
     http://nginx.org/packages/ubuntu `lsb_release -cs` nginx" \
     | sudo tee /etc/apt/sources.list.d/nginx.list
     sudo apt update && \
-    sudo apt install -y nginx=1.22.1-1~jammy
+    sudo apt install -y nginx={NGINX_VERSION}-1~jammy
     sudo apt install /data/bunkerweb.deb -y
     """
 
@@ -588,14 +588,14 @@
 
     # Installing test
     print("Installing bunkerweb...")
-    bash_script = """
+    bash_script = f"""
     apt update && apt install -y sudo && \
     apt-get install gnupg2 ca-certificates lsb-release wget curl -y && \
     echo "deb https://nginx.org/packages/debian/ bookworm nginx" > /etc/apt/sources.list.d/nginx.list && \
     echo "deb-src https://nginx.org/packages/debian/ bookworm nginx" >> /etc/apt/sources.list.d/nginx.list && \
     apt-key adv --keyserver keyserver.ubuntu.com --recv-keys ABF5BD827BD9BF62 && \
     apt-get update && \
-    apt-get install -y --no-install-recommends nginx=1.26.2-1~bookworm
+    apt-get install -y --no-install-recommends nginx={NGINX_VERSION}-1~bookworm
     apt install /data/bunkerweb.deb -y
     """
 
@@ -939,15 +939,15 @@
         ]
     )
     print("Installing bunkerweb...")
-    bash_script = """
+    bash_script = f"""
     apt update && apt install -y sudo && \
     sudo apt install -y curl gnupg2 ca-certificates lsb-release debian-archive-keyring && \
     curl https://nginx.org/keys/nginx_signing.key | gpg --dearmor \
     | sudo tee /usr/share/keyrings/nginx-archive-keyring.gpg >/dev/null && \
     echo "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] \
     http://nginx.org/packages/debian `lsb_release -cs` nginx" \
     | sudo tee /etc/apt/sources.list.d/nginx.list
-    sudo apt update && sudo apt install -y nginx=1.26.2-1~bookworm
+    sudo apt update && sudo apt install -y nginx={NGINX_VERSION}-1~bookworm
     curl -s https://repo.bunkerweb.io/install/script.deb.sh | sudo bash && \
     sudo apt update && \
     sudo apt install -y bunkerweb=1.4.5
@@ -1107,12 +1107,15 @@
         ]
     )
 
+    # TODO: add 1.26.3 when available
+    NGINX_VERSION = "1.26.2"
+
     # Installing test
     print("Installing bunkerweb...")
-    bash_script = """
+    bash_script = f"""
     dnf update -y
     dnf install -y curl gnupg2 ca-certificates redhat-lsb-core
-    dnf install -y nginx-1.22.1-1.fc37
+    dnf install -y nginx-{NGINX_VERSION}-1.fc37
     dnf install /data/bunkerweb.rpm -y
     """
 
@@ -1552,7 +1555,7 @@ def check_container_status():
             "systemd-fedora",
             "bash",
             "-c",
-            "sudo dnf install nginx-1.22.1-1.fc37 -y",
+            f"sudo dnf install nginx-{NGINX_VERSION}-1.fc37 -y",
         ]
     )
     subprocess.run(
@@ -1645,17 +1648,17 @@ def check_container_status():
     # Installing test
     print("Installing bunkerweb...")
     bash_script = (
-        """
+        f"""
     dnf install yum-utils wget sudo -y
-    wget https://nginx.org/packages/rhel/9/x86_64/RPMS/nginx-1.26.2-1.el9.ngx.x86_64.rpm
-    dnf install nginx-1.26.2-1.el9.ngx.x86_64.rpm -y
+    wget https://nginx.org/packages/rhel/9/x86_64/RPMS/nginx-{NGINX_VERSION}-1.el9.ngx.x86_64.rpm
+    dnf install nginx-{NGINX_VERSION}-1.el9.ngx.x86_64.rpm -y
     dnf install /data/bunkerweb.rpm -y
     """
         if distro.endswith("9")
-        else """
+        else f"""
     dnf install yum-utils wget sudo -y
-    wget https://nginx.org/packages/rhel/8/x86_64/RPMS/nginx-1.26.2-1.el8.ngx.x86_64.rpm
-    dnf install nginx-1.26.2-1.el8.ngx.x86_64.rpm -y
+    wget https://nginx.org/packages/rhel/8/x86_64/RPMS/nginx-{NGINX_VERSION}-1.el8.ngx.x86_64.rpm
+    dnf install nginx-{NGINX_VERSION}-1.el8.ngx.x86_64.rpm -y
     dnf install /data/bunkerweb.rpm -y
     """
     )
@@ -2164,9 +2167,9 @@ def check_container_status():
 
     # Installing test
     print("Installing bunkerweb...")
-    bash_script = """
+    bash_script = f"""
     dnf install yum-utils epel-release redhat-lsb-core -y
-    dnf install -y nginx-1.22.1
+    dnf install -y nginx-{NGINX_VERSION}
     dnf install /data/bunkerweb.rpm -y
     """
 

tests/linux/Dockerfile-debian

@@ -3,7 +3,7 @@ FROM debian:bookworm@sha256:321341744acb788e251ebd374aecc1a42d60ce65da7bd4ee9207
 ENV container=docker
 ENV LC_ALL=C
 ENV DEBIAN_FRONTEND=noninteractive
-ENV NGINX_VERSION=1.26.2
+ENV NGINX_VERSION=1.26.3
 
 RUN apt-get update \
     && apt-get install -y systemd systemd-sysv \

tests/linux/Dockerfile-rhel

@@ -1,6 +1,6 @@
 FROM redhat/ubi8-init:8.10@sha256:ed9318ba91e46547573479d2dda889f79cf670f19b20f30d8106ef06e0610364
 
-ENV NGINX_VERSION=1.26.2
+ENV NGINX_VERSION=1.26.3
 
 # Copy rocky repo
 COPY src/linux/rocky-8.repo /etc/yum.repos.d/rocky.repo

tests/linux/Dockerfile-rhel9

@@ -1,6 +1,6 @@
 FROM redhat/ubi9-init:9.5@sha256:09e9abe5d8b013ac48b66954721479313a7cd4744b3dd5bc8b28c94c9fa92cf9
 
-ENV NGINX_VERSION=1.26.2
+ENV NGINX_VERSION=1.26.3
 
 # Copy rocky repo
 COPY src/linux/rocky-9.repo /etc/yum.repos.d/rocky.repo

tests/linux/Dockerfile-ubuntu

@@ -3,7 +3,7 @@ FROM ubuntu:noble@sha256:80dd3c3b9c6cecb9f1667e9290b3bc61b78c2678c02cbdae5f0fea9
 ENV container=docker
 ENV LC_ALL=C
 ENV DEBIAN_FRONTEND=noninteractive
-ENV NGINX_VERSION=1.26.2
+ENV NGINX_VERSION=1.26.3
 
 RUN apt-get update \
     && apt-get install -y systemd systemd-sysv \

tests/linux/Dockerfile-ubuntu-jammy

@@ -3,7 +3,7 @@ FROM ubuntu:jammy@sha256:0e5e4a57c2499249aafc3b40fcd541e9a456aab7296681a3994d631
 ENV container=docker
 ENV LC_ALL=C
 ENV DEBIAN_FRONTEND=noninteractive
-ENV NGINX_VERSION=1.26.2
+ENV NGINX_VERSION=1.26.3
 
 RUN apt-get update \
     && apt-get install -y systemd systemd-sysv \