Merge pull request #129 from crazy-max/fedora-38

distro: add fedora 38
docker · May 28, 2023 · 3c27157 · 3c27157
2 parents 6ace256 + a15f42f
commit 3c27157
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 ubuntu1804 ubuntu2004 ubuntu2204 ubuntu2304 centos7 centos9 oraclelinux7 fedora37 static
+	GHA_RELEASES := debian10 debian11 debian12 ubuntu1804 ubuntu2004 ubuntu2204 ubuntu2304 centos7 centos9 oraclelinux7 fedora37 fedora38 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
@@ -240,6 +240,17 @@ target "_pkg-fedora37" {
   }
 }
 
+target "_pkg-fedora38" {
+  args = {
+    PKG_RELEASE = "fedora38"
+    PKG_TYPE = "rpm"
+    PKG_DISTRO = "fedora"
+    PKG_DISTRO_ID = "38"
+    PKG_DISTRO_SUITE = "38"
+    PKG_BASE_IMAGE = "fedora:38"
+  }
+}
+
 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 ubuntu1804 ubuntu2004 ubuntu2204 ubuntu2210 ubuntu2304 raspbian10 raspbian11 raspbian12
-PKG_RPM_RELEASES ?= centos7 centos8 centos9 fedora36 fedora37 oraclelinux7 oraclelinux8 oraclelinux9
+PKG_RPM_RELEASES ?= centos7 centos8 centos9 fedora36 fedora37 fedora38 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#,$##'
@@ -214,6 +214,15 @@ pkg-info-fedora37:
 	$(eval PKG_BASE_IMAGE = fedora:37)
 	$(eval PKG_SUPPORTED_PLATFORMS = linux/amd64 linux/arm64 linux/ppc64le linux/s390x)
 
+.PHONY: pkg-info-fedora38
+pkg-info-fedora38:
+	$(eval PKG_TYPE = rpm)
+	$(eval PKG_DISTRO = fedora)
+	$(eval PKG_DISTRO_ID = 38)
+	$(eval PKG_DISTRO_SUITE = 38)
+	$(eval PKG_BASE_IMAGE = fedora:38)
+	$(eval PKG_SUPPORTED_PLATFORMS = linux/amd64 linux/arm64 linux/ppc64le linux/s390x)
+
 .PHONY: pkg-info-oraclelinux7
 pkg-info-oraclelinux7:
 	$(eval PKG_TYPE = rpm)