From 606fbb6f3be3d0cbfec32a7f76d745d07d5ff54d Mon Sep 17 00:00:00 2001
From: CrazyMax <1951866+crazy-max@users.noreply.github.com>
Date: Mon, 23 Jun 2025 11:57:41 +0200
Subject: [PATCH 1/2] distro: remove fedora 37, 38, 39

Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
---
 Makefile        |  2 +-
 docker-bake.hcl | 38 --------------------------------------
 2 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/Makefile b/Makefile
index 08b3bd6f..ff7393a3 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@
 
 # Same as ones in docker-bake.hcl
 DISTROS_DEB ?= debian11 debian12 debian13 ubuntu2204 ubuntu2404 raspbian11 raspbian12
-DISTROS_RPM ?= centos9 fedora37 fedora38 fedora39 oraclelinux8 oraclelinux9
+DISTROS_RPM ?= centos9 oraclelinux8 oraclelinux9
 DISTROS_STATIC ?= static
 DISTROS ?= $(DISTROS_DEB) $(DISTROS_RPM) $(DISTROS_STATIC)
 
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 39f208a2..d30b2a36 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -24,8 +24,6 @@ variable "DISTROS" {
     "ubuntu2204",
     "ubuntu2404",
     "centos9",
-    "fedora37",
-    "fedora38",
     "fedora39",
     "oraclelinux8",
     "oraclelinux9"
@@ -255,39 +253,6 @@ target "_distro-centos9" {
   }
 }
 
-target "_distro-fedora37" {
-  args = {
-    DISTRO_NAME = "fedora37"
-    DISTRO_TYPE = "rpm"
-    DISTRO_RELEASE = "fedora"
-    DISTRO_ID = "37"
-    DISTRO_SUITE = "37"
-    DISTRO_IMAGE = DISTRO_IMAGE != null ? DISTRO_IMAGE : "fedora:37"
-  }
-}
-
-target "_distro-fedora38" {
-  args = {
-    DISTRO_NAME = "fedora38"
-    DISTRO_TYPE = "rpm"
-    DISTRO_RELEASE = "fedora"
-    DISTRO_ID = "38"
-    DISTRO_SUITE = "38"
-    DISTRO_IMAGE = DISTRO_IMAGE != null ? DISTRO_IMAGE : "fedora:38"
-  }
-}
-
-target "_distro-fedora39" {
-  args = {
-    DISTRO_NAME = "fedora39"
-    DISTRO_TYPE = "rpm"
-    DISTRO_RELEASE = "fedora"
-    DISTRO_ID = "39"
-    DISTRO_SUITE = "39"
-    DISTRO_IMAGE = DISTRO_IMAGE != null ? DISTRO_IMAGE : "fedora:39"
-  }
-}
-
 target "_distro-oraclelinux8" {
   args = {
     DISTRO_NAME = "oraclelinux8"
@@ -329,9 +294,6 @@ function "distroPlatforms" {
         ubuntu2204 = ["linux/amd64", "linux/arm64", "linux/arm/v7", "linux/ppc64le", "linux/s390x"]
         ubuntu2404 = ["linux/amd64", "linux/arm64", "linux/arm/v7", "linux/ppc64le", "linux/riscv64", "linux/s390x"]
         centos9 = ["linux/amd64", "linux/arm64", "linux/ppc64le"]
-        fedora37 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]
-        fedora38 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]
-        fedora39 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]
         oraclelinux8 = ["linux/amd64", "linux/arm64"]
         oraclelinux9 = ["linux/amd64", "linux/arm64"]
       }, distro, []),

From c5efd57516e8d24397b2f4ab16931a6851193a8a Mon Sep 17 00:00:00 2001
From: CrazyMax <1951866+crazy-max@users.noreply.github.com>
Date: Mon, 23 Jun 2025 11:59:28 +0200
Subject: [PATCH 2/2] distro: add fedora 41 and 42

Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
---
 Makefile        |  2 +-
 docker-bake.hcl | 27 ++++++++++++++++++++++++++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index ff7393a3..2b39eb17 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@
 
 # Same as ones in docker-bake.hcl
 DISTROS_DEB ?= debian11 debian12 debian13 ubuntu2204 ubuntu2404 raspbian11 raspbian12
-DISTROS_RPM ?= centos9 oraclelinux8 oraclelinux9
+DISTROS_RPM ?= centos9 fedora41 fedora42 oraclelinux8 oraclelinux9
 DISTROS_STATIC ?= static
 DISTROS ?= $(DISTROS_DEB) $(DISTROS_RPM) $(DISTROS_STATIC)
 
diff --git a/docker-bake.hcl b/docker-bake.hcl
index d30b2a36..bb33955a 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -24,7 +24,8 @@ variable "DISTROS" {
     "ubuntu2204",
     "ubuntu2404",
     "centos9",
-    "fedora39",
+    "fedora41",
+    "fedora42",
     "oraclelinux8",
     "oraclelinux9"
   ]
@@ -253,6 +254,28 @@ target "_distro-centos9" {
   }
 }
 
+target "_distro-fedora41" {
+  args = {
+    DISTRO_NAME = "fedora41"
+    DISTRO_TYPE = "rpm"
+    DISTRO_RELEASE = "fedora"
+    DISTRO_ID = "41"
+    DISTRO_SUITE = "41"
+    DISTRO_IMAGE = DISTRO_IMAGE != null ? DISTRO_IMAGE : "fedora:41"
+  }
+}
+
+target "_distro-fedora42" {
+  args = {
+    DISTRO_NAME = "fedora42"
+    DISTRO_TYPE = "rpm"
+    DISTRO_RELEASE = "fedora"
+    DISTRO_ID = "42"
+    DISTRO_SUITE = "42"
+    DISTRO_IMAGE = DISTRO_IMAGE != null ? DISTRO_IMAGE : "fedora:42"
+  }
+}
+
 target "_distro-oraclelinux8" {
   args = {
     DISTRO_NAME = "oraclelinux8"
@@ -294,6 +317,8 @@ function "distroPlatforms" {
         ubuntu2204 = ["linux/amd64", "linux/arm64", "linux/arm/v7", "linux/ppc64le", "linux/s390x"]
         ubuntu2404 = ["linux/amd64", "linux/arm64", "linux/arm/v7", "linux/ppc64le", "linux/riscv64", "linux/s390x"]
         centos9 = ["linux/amd64", "linux/arm64", "linux/ppc64le"]
+        fedora41 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]
+        fedora42 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]
         oraclelinux8 = ["linux/amd64", "linux/arm64"]
         oraclelinux9 = ["linux/amd64", "linux/arm64"]
       }, distro, []),