Merge pull request #169 from crazy-max/fedora-39

distro: add fedora 39
docker · Oct 21, 2023 · 4e280fb · 4e280fb
2 parents 8f6b98d + d02ddfa
commit 4e280fb
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -40,7 +40,7 @@ include common/packages.mk
 
 GHA_MATRIX ?= minimal
 ifeq ($(GHA_MATRIX),minimal)
-	GHA_RELEASES := debian10 debian11 debian12 ubuntu2004 ubuntu2204 ubuntu2304 centos7 centos9 oraclelinux7 fedora37 fedora38 static
+	GHA_RELEASES := debian10 debian11 debian12 ubuntu2004 ubuntu2204 ubuntu2304 centos7 centos9 oraclelinux7 fedora38 fedora39 static
 else ifeq ($(GHA_MATRIX),all)
 	GHA_RELEASES := $(PKG_DEB_RELEASES) $(PKG_RPM_RELEASES) static
 else

diff --git a/common/packages.hcl b/common/packages.hcl
@@ -218,6 +218,17 @@ target "_pkg-fedora38" {
   }
 }
 
+target "_pkg-fedora39" {
+  args = {
+    PKG_RELEASE = "fedora39"
+    PKG_TYPE = "rpm"
+    PKG_DISTRO = "fedora"
+    PKG_DISTRO_ID = "39"
+    PKG_DISTRO_SUITE = "39"
+    PKG_BASE_IMAGE = "fedora:39"
+  }
+}
+
 target "_pkg-oraclelinux7" {
   args = {
     PKG_RELEASE = "oraclelinux7"

diff --git a/common/packages.mk b/common/packages.mk
@@ -16,7 +16,7 @@
 # if you add a new release
 PKG_APK_RELEASES ?= alpine314 alpine315 alpine316
 PKG_DEB_RELEASES ?= debian10 debian11 debian12 ubuntu2004 ubuntu2204 ubuntu2304 raspbian10 raspbian11 raspbian12
-PKG_RPM_RELEASES ?= centos7 centos8 centos9 fedora37 fedora38 oraclelinux7 oraclelinux8 oraclelinux9
+PKG_RPM_RELEASES ?= centos7 centos8 centos9 fedora37 fedora38 fedora39 oraclelinux7 oraclelinux8 oraclelinux9
 
 # PKG_SUPPORTED_PLATFORMS could be replaced by:
 # docker buildx imagetools inspect centos:7 --format "{{json .Manifest}}" | jq -r '.manifests[] | "\(.platform.os)/\(.platform.architecture)/\(.platform.variant)"' | sed 's#/null$##' | tr '\n' ',' | sed 's#,$##'
@@ -195,6 +195,15 @@ pkg-info-fedora38:
 	$(eval PKG_BASE_IMAGE = fedora:38)
 	$(eval PKG_SUPPORTED_PLATFORMS = linux/amd64 linux/arm64 linux/ppc64le linux/s390x)
 
+.PHONY: pkg-info-fedora39
+pkg-info-fedora39:
+	$(eval PKG_TYPE = rpm)
+	$(eval PKG_DISTRO = fedora)
+	$(eval PKG_DISTRO_ID = 39)
+	$(eval PKG_DISTRO_SUITE = 39)
+	$(eval PKG_BASE_IMAGE = fedora:39)
+	$(eval PKG_SUPPORTED_PLATFORMS = linux/amd64 linux/arm64 linux/ppc64le linux/s390x)
+
 .PHONY: pkg-info-oraclelinux7
 pkg-info-oraclelinux7:
 	$(eval PKG_TYPE = rpm)