Update Fedora to version 40

DitZii · Jun 4, 2024 · c9ef54b · c9ef54b
1 parent 1abe933
commit c9ef54b
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
@@ -197,7 +197,7 @@ jobs:
           - linux: fedora
             separator: "-"
             suffix: "1."
-            version: 39
+            version: 40
             package: rpm
           - linux: el
             separator: "-"

diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -208,7 +208,7 @@ jobs:
             package_arch: x86_64
             separator: "-"
             suffix: "1."
-            version: 39
+            version: 40
             package: rpm
           - linux: el
             package_arch: x86_64

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -211,7 +211,7 @@ jobs:
           - linux: fedora
             separator: "-"
             suffix: "1."
-            version: 39
+            version: 40
             package: rpm
           - linux: el
             separator: "-"

diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
@@ -244,7 +244,7 @@ jobs:
             package_arch: x86_64
             separator: "-"
             suffix: "1."
-            version: 39
+            version: 40
             package: rpm
           - linux: el
             package_arch: x86_64

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## v1.5.8 - ????/??/??
 
+- [LINUX] Support Fedora 40 and drop support of Fedora 39
 - [BUGFIX] Fix potential errors when upgrading from a previous version
 - [BUGFIX] Fix rare bug on the web UI when editing the SERVER_NAME setting of a service
 - [BUGFIX] Fix potential race conditions between the autoconf and the scheduler waiting for each other indefinitely

diff --git a/README.md b/README.md
@@ -275,7 +275,7 @@ List of supported Linux distros :
 - Debian 12 "Bookworm"
 - Ubuntu 22.04 "Noble"
 - Ubuntu 24.04 "Jammy"
-- Fedora 39
+- Fedora 40
 - RHEL 8.9
 - RHEL 9.4
 

diff --git a/docs/integrations.md b/docs/integrations.md
@@ -316,7 +316,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 39
+- Fedora 40
 - Red Hat Enterprise Linux (RHEL) 8.9
 - Red Hat Enterprise Linux (RHEL) 9.4
 

diff --git a/src/linux/Dockerfile-fedora b/src/linux/Dockerfile-fedora
@@ -1,4 +1,4 @@
-FROM fedora:39@sha256:ee042eb5527cfe117d279af0fff4461ad0c5441a8ef36deea9d98a2eb0130a90 as builder
+FROM fedora:40@sha256:5ce8497aeea599bf6b54ab3979133923d82aaa4f6ca5ced1812611b197c79eb0 as builder
 
 ENV OS=fedora
 ENV NGINX_VERSION 1.26.1
@@ -54,7 +54,7 @@ COPY src/scheduler scheduler
 COPY src/ui ui
 COPY src/VERSION VERSION
 
-FROM fedora:39@sha256:ee042eb5527cfe117d279af0fff4461ad0c5441a8ef36deea9d98a2eb0130a90
+FROM fedora:40@sha256:5ce8497aeea599bf6b54ab3979133923d82aaa4f6ca5ced1812611b197c79eb0
 
 # Set default umask to prevent huge recursive chmod increasing the final image size
 RUN umask 027

diff --git a/src/linux/fpm-fedora b/src/linux/fpm-fedora
@@ -4,7 +4,7 @@
 --version %VERSION%
 --architecture %ARCH%
 --depends bash --depends python3 --depends 'nginx >= 1:1.26.1' --depends 'nginx < 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 nginx-mod-stream --depends pcre --depends libpq --depends libcap --depends openssl --depends logrotate --depends mysql --depends postgresql --depends sqlite3 --depends unzip
---description "BunkerWeb %VERSION% for Fedora 39"
+--description "BunkerWeb %VERSION% for Fedora 40"
 --url "https://www.bunkerweb.io"
 --maintainer "Bunkerity <contact at bunkerity dot com>"
 --before-install /usr/share/bunkerweb/scripts/beforeInstall.sh

diff --git a/tests/linux/Dockerfile-fedora b/tests/linux/Dockerfile-fedora
@@ -1,4 +1,4 @@
-FROM fedora:39@sha256:ee042eb5527cfe117d279af0fff4461ad0c5441a8ef36deea9d98a2eb0130a90
+FROM fedora:40@sha256:5ce8497aeea599bf6b54ab3979133923d82aaa4f6ca5ced1812611b197c79eb0
 
 ENV container docker
 ENV NGINX_VERSION 1.26.1