Skip to content

rpm: add rockylinux and almalinux #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
crazy-max merged 3 commits into from
Jun 27, 2025
Merged

rpm: add rockylinux and almalinux #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e95bba
rpm: add rockylinux 8 and 9
crazy-max Jun 14, 2025
104a608
rpm: add almalinux 8 and 9
crazy-max Jun 14, 2025
84d036a
sort distros
crazy-max Jun 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,25 @@
# limitations under the License.

# Same as ones in docker-bake.hcl
DISTROS_DEB ?= debian11 debian12 debian13 ubuntu2204 ubuntu2404 raspbian11 raspbian12
DISTROS_RPM ?= centos9 fedora41 fedora42 oraclelinux8 oraclelinux9
DISTROS_STATIC ?= static
DISTROS ?= $(DISTROS_DEB) $(DISTROS_RPM) $(DISTROS_STATIC)
DISTROS ?= static \
\
debian11 \
debian12 \
debian13 \
raspbian11 \
raspbian12 \
ubuntu2204 \
ubuntu2404 \
\
almalinux8 \
almalinux9 \
centos9 \
fedora41 \
fedora42 \
oraclelinux8 \
oraclelinux9 \
rockylinux8 \
rockylinux9

# Should match ones from docker-bake.hcl
PKGS_RAW := $(notdir $(shell find "pkg/" -maxdepth 1 -type d))
Expand Down
58 changes: 57 additions & 1 deletion docker-bake.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,24 @@ variable "DISTROS" {
description = "List of supported distros. Don't forget to update _distro-* target if you add/remove a distro."
default = [
"static",

"debian11",
"debian12",
"debian13",
"raspbian11",
"raspbian12",
"ubuntu2204",
"ubuntu2404",

"almalinux8",
"almalinux9",
"centos9",
"fedora41",
"fedora42",
"oraclelinux8",
"oraclelinux9"
"oraclelinux9",
"rockylinux8",
"rockylinux9"
]
}

Expand Down Expand Up @@ -243,6 +249,28 @@ target "_distro-ubuntu2404" {
}
}

target "_distro-almalinux8" {
args = {
DISTRO_NAME = "almalinux8"
DISTRO_TYPE = "rpm"
DISTRO_RELEASE = "almalinux"
DISTRO_ID = "8"
DISTRO_SUITE = "8"
DISTRO_IMAGE = DISTRO_IMAGE != null ? DISTRO_IMAGE : "almalinux:8"
}
}

target "_distro-almalinux9" {
args = {
DISTRO_NAME = "almalinux9"
DISTRO_TYPE = "rpm"
DISTRO_RELEASE = "almalinux"
DISTRO_ID = "9"
DISTRO_SUITE = "9"
DISTRO_IMAGE = DISTRO_IMAGE != null ? DISTRO_IMAGE : "almalinux:9"
}
}

target "_distro-centos9" {
args = {
DISTRO_NAME = "centos9"
Expand Down Expand Up @@ -298,6 +326,28 @@ target "_distro-oraclelinux9" {
}
}

target "_distro-rockylinux8" {
args = {
DISTRO_NAME = "rockylinux8"
DISTRO_TYPE = "rpm"
DISTRO_RELEASE = "rockylinux"
DISTRO_ID = "8"
DISTRO_SUITE = "8"
DISTRO_IMAGE = DISTRO_IMAGE != null ? DISTRO_IMAGE : "rockylinux/rockylinux:8"
}
}

target "_distro-rockylinux9" {
args = {
DISTRO_NAME = "rockylinux9"
DISTRO_TYPE = "rpm"
DISTRO_RELEASE = "rockylinux"
DISTRO_ID = "9"
DISTRO_SUITE = "9"
DISTRO_IMAGE = DISTRO_IMAGE != null ? DISTRO_IMAGE : "rockylinux/rockylinux:9"
}
}

# Returns the list of supported platforms for a given distro and package.
# The result is the intersection of the platforms supported by the distro
# and the platforms supported by the package. Except for static distro,
Expand All @@ -309,18 +359,24 @@ function "distroPlatforms" {
setintersection(
lookup({
static = pkgPlatforms(pkg)

debian11 = ["linux/386", "linux/amd64", "linux/arm64", "linux/arm/v7", "linux/mips64le", "linux/ppc64le", "linux/s390x"]
debian12 = ["linux/386", "linux/amd64", "linux/arm64", "linux/arm/v7", "linux/mips64le", "linux/ppc64le", "linux/s390x"]
debian13 = ["linux/386", "linux/amd64", "linux/arm64", "linux/arm/v7", "linux/mips64le", "linux/ppc64le", "linux/riscv64", "linux/s390x"]
raspbian11 = ["linux/arm/v7"]
raspbian12 = ["linux/arm/v7"]
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"]

almalinux8 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]
almalinux9 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "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"]
rockylinux8 = ["linux/amd64", "linux/arm64"]
rockylinux9 = ["linux/amd64", "linux/arm64"]
}, distro, []),
pkgPlatforms(pkg)
),
Expand Down
8 changes: 8 additions & 0 deletions hack/scripts/rpm-init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,12 @@ case "$pkgrelease" in
fedora*)
dnf install -y git rpm-build rpmlint dnf-plugins-core
;;
rockylinux8|almalinux8)
dnf install -y git rpm-build rpmlint dnf-plugins-core epel-release
dnf config-manager --set-enabled powertools
;;
rockylinux*|almalinux*)
dnf install -y git rpm-build rpmlint dnf-plugins-core epel-release
dnf config-manager --set-enabled crb
;;
esac
8 changes: 8 additions & 0 deletions hack/scripts/verify-rpm-init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,12 @@ case "$pkgrelease" in
fedora*)
dnf install -y findutils dnf-plugins-core
;;
rockylinux8|almalinux8)
dnf install -y findutils dnf-plugins-core epel-release
dnf config-manager --set-enabled powertools
;;
rockylinux*|almalinux*)
dnf install -y findutils dnf-plugins-core epel-release
dnf config-manager --set-enabled crb
;;
esac