Update support for Fedora to version 41 and drop support for version 40 across workflows, Dockerfiles, and documentation

.github/workflows/1.5.yml

@@ -208,7 +208,7 @@ jobs:
             package_arch: x86_64
             separator: "-"
             suffix: "1."
-            version: 40
+            version: 41
             package: rpm
           - linux: el
             package_arch: x86_64

.github/workflows/beta.yml

@@ -147,7 +147,8 @@ jobs:
     needs: [create-arm, wait-builds]
     strategy:
       matrix:
-        image: [bunkerweb, bunkerweb-scheduler, bunkerweb-autoconf, bunkerweb-ui]
+        image:
+          [bunkerweb, bunkerweb-scheduler, bunkerweb-autoconf, bunkerweb-ui]
         include:
           - release: beta
           - image: bunkerweb
@@ -198,7 +199,7 @@ jobs:
           - linux: fedora
             separator: "-"
             suffix: "1."
-            version: 40
+            version: 41
             package: rpm
           - linux: el
             separator: "-"

.github/workflows/dev.yml

@@ -210,7 +210,7 @@ jobs:
             package_arch: x86_64
             separator: "-"
             suffix: "1."
-            version: 40
+            version: 41
             package: rpm
           - linux: el
             package_arch: x86_64

.github/workflows/release.yml

@@ -211,7 +211,7 @@ jobs:
           - linux: fedora
             separator: "-"
             suffix: "1."
-            version: 40
+            version: 41
             package: rpm
           - linux: el
             separator: "-"

.github/workflows/staging.yml

@@ -244,7 +244,7 @@ jobs:
             package_arch: x86_64
             separator: "-"
             suffix: "1."
-            version: 40
+            version: 41
             package: rpm
           - linux: el
             package_arch: x86_64

CHANGELOG.md

@@ -15,6 +15,7 @@
 - [SCHEDULER] Refactor the scheduler to use the `BUNKERWEB_INSTANCES` (previously known as `OVERRIDE_INSTANCES`) environment variable instead of an integration specific system
 - [AUTOCONF] Add new `NAMESPACES` environment variable to allow setting the namespaces to watch for the autoconf feature which makes it possible to use multiple autoconf instances in the same cluster while keeping the configuration separated
 - [AUTOCONF] Add new `USE_KUBERNETES_FQDN` environment variable to allow using the full qualified domain name of the services in Kubernetes instead of the ip address for the hostname of instances (default is yes)
+- [LINUX] Support Fedora 41 and drop support of Fedora 40
 - [UI] Start refactoring the UI to make it more modular and easier to maintain
 - [UI] Add a `remember me` feature to the login page so that the user can stay logged in for a longer period of time (expires after 31 days)
 - [UI] Add new `TOTP_SECRETS` setting to encrypt the TOTP secrets in the database (if not set, we generate a random amount of secrets via passlib.totp) - ⚠ We highly recommend setting this setting to a custom value to prevent the secrets from being erased when the volumes are deleted

README.md

@@ -298,7 +298,7 @@ List of supported Linux distros :
 - Debian 12 "Bookworm"
 - Ubuntu 22.04 "Noble"
 - Ubuntu 24.04 "Jammy"
-- Fedora 40
+- Fedora 41
 - RHEL 8.9
 - RHEL 9.4
 

docs/integrations.md

@@ -323,7 +323,7 @@ Supported Linux distributions for BunkerWeb (amd64/x86_64 and arm64/aarch64 arch
 - Debian 12 "Bookworm"
 - Ubuntu 22.04 "Jammy"
 - Ubuntu 24.04 "Noble"
-- Fedora 40
+- Fedora 41
 - Red Hat Enterprise Linux (RHEL) 8.9
 - Red Hat Enterprise Linux (RHEL) 9.4
 

src/deps/install.sh

@@ -202,7 +202,7 @@ CONFARGS="${CONFARGS/-Os -fomit-frame-pointer -g/-Os}"
 CONFARGS="$(echo -n "$CONFARGS" | sed "s/--with-ld-opt=-Wl/--with-ld-opt='-lpcre -Wl'/")"
 CONFARGS="$(echo -n "$CONFARGS" | sed "s/--with-ld-opt='-Wl/--with-ld-opt='-lpcre -Wl/")"
 if [ "$OS" = "fedora" ] ; then
-	CONFARGS="$(echo -n "$CONFARGS" | sed "s/--with-ld-opt='.*'/--with-ld-opt=-lpcre/" | sed "s/--with-cc-opt='.*'//")"
+	CONFARGS="$(echo -n "$CONFARGS" | sed "s/--with-ld-opt='.*'/--with-ld-opt=-lpcre/" | sed "s/--with-cc-opt='.*'//" | sed "s/--without-engine//")"
 fi
 
 # Set CFALGS

src/linux/Dockerfile-fedora

@@ -1,4 +1,4 @@
-FROM fedora:40@sha256:d0207dbb078ee261852590b9a8f1ab1f8320547be79a2f39af9f3d23db33735e AS builder
+FROM fedora:41@sha256:3ec60eb34fa1a095c0c34dd37cead9fd38afb62612d43892fcf1d3425c32bc1e AS builder
 
 ENV OS=fedora
 ENV NGINX_VERSION=1.26.2
@@ -7,7 +7,7 @@ ENV NGINX_VERSION=1.26.2
 RUN dnf update -y && \
     dnf install -y curl gnupg2 ca-certificates redhat-lsb-core make gcc && \
     dnf install -y --setopt=install_weak_deps=False python3 python3-devel python3-pip brotli brotli-devel gperftools-devel perl libxslt-devel libxml2 yajl yajl-devel libxslt bash gd gd-devel gcc-c++ kernel-devel znc-modtcl libmpc-devel gmp-devel gawk mpfr-devel libtool pcre-devel automake autoconf readline-devel gcc make openssl-devel git zlib-devel libxml2-devel pkgconf libcurl-devel geoip-devel lmdb-devel && \
-    dnf install --enablerepo=updates-testing nginx-${NGINX_VERSION} -y
+    dnf install nginx-${NGINX_VERSION} -y
 
 WORKDIR /tmp/bunkerweb/deps
 
@@ -53,7 +53,7 @@ COPY src/scheduler scheduler
 COPY src/VERSION VERSION
 COPY src/ui ui
 
-FROM fedora:40@sha256:d0207dbb078ee261852590b9a8f1ab1f8320547be79a2f39af9f3d23db33735e
+FROM fedora:41@sha256:3ec60eb34fa1a095c0c34dd37cead9fd38afb62612d43892fcf1d3425c32bc1e
 
 # Set default umask to prevent huge recursive chmod increasing the final image size
 RUN umask 027
@@ -101,6 +101,9 @@ COPY src/linux/fpm-fedora /usr/share/.fpm
 COPY --chmod=644 src/linux/*.service /lib/systemd/system/
 COPY --chmod=644 src/linux/bunkerweb.logrotate /etc/logrotate.d/bunkerweb
 
+# TMP patch for fpm
+RUN sed -i -e 's/args = \["rpmbuild", "-bb"\]/args = \["rpmbuild", "-bb", "--buildroot", "#{build_path}\/BUILD"\]/g' /usr/local/share/gems/gems/fpm-*/lib/fpm/package/rpm.rb
+
 # Generate RPM at startup
 VOLUME /data
 WORKDIR /usr/share/

src/linux/fpm-fedora

@@ -3,8 +3,8 @@
 --license agpl3
 --version %VERSION%
 --architecture %ARCH%
---depends bash --depends python3 --depends 'nginx >= 1:1.26.2' --depends 'nginx < 1:1.27.0' --depends 'nginx-mod-stream >= 1:1.26.2' --depends 'nginx-mod-stream < 1:1.27.0' --depends libcurl-devel --depends libxml2 --depends yajl --depends lmdb-libs --depends geoip-devel --depends gd --depends sudo --depends procps --depends lsof --depends pcre --depends libpq --depends libcap --depends openssl --depends logrotate --depends mysql --depends postgresql --depends sqlite3 --depends unzip
---description "BunkerWeb %VERSION% for Fedora 40"
+--depends bash --depends python3 --depends 'nginx = 2:1.26.2' --depends 'nginx-mod-stream = 2:1.26.2' --depends libcurl-devel --depends libxml2 --depends yajl --depends lmdb-libs --depends geoip-devel --depends gd --depends sudo --depends procps --depends lsof --depends pcre --depends libpq --depends libcap --depends openssl --depends logrotate --depends mysql --depends postgresql --depends sqlite3 --depends unzip
+--description "BunkerWeb %VERSION% for Fedora 41"
 --url "https://www.bunkerweb.io"
 --maintainer "Bunkerity <contact at bunkerity dot com>"
 --before-install /usr/share/bunkerweb/scripts/beforeInstall.sh

tests/linux/Dockerfile-fedora

@@ -1,4 +1,4 @@
-FROM fedora:40@sha256:d0207dbb078ee261852590b9a8f1ab1f8320547be79a2f39af9f3d23db33735e
+FROM fedora:41@sha256:3ec60eb34fa1a095c0c34dd37cead9fd38afb62612d43892fcf1d3425c32bc1e
 
 ENV container=docker
 ENV NGINX_VERSION=1.26.2