Merge pull request syslog-ng#4992 from HofiOne/support-fedora-40

HofiOne · web-flow · commit 548b33333f73 · 2024-06-11T11:32:48.000+02:00
dbld: support fedora-40
diff --git a/.github/workflows/create-packages.yml b/.github/workflows/create-packages.yml
@@ -24,7 +24,7 @@ on:
           "ubuntu-lunar",
           "ubuntu-mantic",
           "almalinux-8",
-          "fedora-39"
+          "fedora-40"
         ]'
 
 
diff --git a/.github/workflows/dbld-images.yml b/.github/workflows/dbld-images.yml
@@ -30,7 +30,7 @@ jobs:
       matrix:
         image:
           - almalinux-8
-          - fedora-39
+          - fedora-40
           - debian-bullseye
           - debian-bookworm
           - debian-sid
diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml
@@ -37,6 +37,6 @@ jobs:
         "almalinux-8",
         "debian-bookworm",
         "debian-testing",
-        "fedora-39",
+        "fedora-40",
         "ubuntu-noble"
       ]'
diff --git a/dbld/Makefile.am b/dbld/Makefile.am
@@ -28,7 +28,7 @@ EXTRA_DIST += \
 	dbld/images/fedora.prepare.sh \
 	dbld/images/almalinux-8.dockerfile \
 	dbld/images/devshell.dockerfile \
-	dbld/images/fedora-39.dockerfile \
+	dbld/images/fedora-40.dockerfile \
 	dbld/images/debian-bullseye.dockerfile \
 	dbld/images/debian-bookworm.dockerfile \
 	dbld/images/debian-sid.dockerfile \
diff --git a/dbld/images/fedora-40.dockerfile b/dbld/images/fedora-40.dockerfile
@@ -1,7 +1,7 @@
-FROM fedora:39
-LABEL maintainer="Andras Mitzki <andras.mitzki@balabit.com>, Laszlo Szemere <laszlo.szemere@balabit.com>, Balazs Scheidler <bazsi77@gmail.com>"
+FROM fedora:40
+LABEL org.opencontainers.image.authors="kira.syslogng@gmail.com"
 ENV OS_DISTRIBUTION=fedora
-ENV OS_DISTRIBUTION_CODE_NAME=39
+ENV OS_DISTRIBUTION_CODE_NAME=40
 
 ARG ARG_IMAGE_PLATFORM
 ARG COMMIT
diff --git a/dbld/rules b/dbld/rules
@@ -2,7 +2,7 @@
 
 BUILDER_IMAGES=		\
 	almalinux-8	\
-	fedora-39	\
+	fedora-40	\
 	debian-stretch	\
 	debian-bullseye	\
 	debian-bookworm	\
