Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 13 additions & 0 deletions docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ variable "DISTROS" {
"oraclelinux9",
"rhel8",
"rhel9",
"rhel10",
"rockylinux8",
"rockylinux9"
]
Expand Down Expand Up @@ -405,6 +406,18 @@ target "_distro-rhel9" {
}
}

target "_distro-rhel10" {
args = {
DISTRO_NAME = "rhel10"
DISTRO_TYPE = "rpm"
DISTRO_RELEASE = "rhel"
DISTRO_ID = "10"
DISTRO_SUITE = "10"
DISTRO_IMAGE = DISTRO_IMAGE != null && DISTRO_IMAGE != "" ? DISTRO_IMAGE : "registry.access.redhat.com/ubi10/ubi"
TEST_ONLY = "0"
}
}

target "_distro-rockylinux8" {
args = {
DISTRO_NAME = "rockylinux8"
Expand Down
10 changes: 9 additions & 1 deletion hack/scripts/rpm-init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,16 @@ case "$pkgrelease" in
dnf install -y git rpm-build rpmlint dnf-plugins-core epel-release
dnf config-manager --set-enabled crb
;;
rhel*)
rhel8|rhel9)
dnf install -y git rpm-build rpmlint dnf-plugins-core
;;
rhel*)
dnf install -y git rpm-build dnf-plugins-core
;;
esac

case "$pkgrelease" in
rhel*)
rm -f /etc/rhsm-host
if [ -z "$RH_USER" ] || [ -z "$RH_PASS" ]; then
echo "Either RH_USER or RH_PASS is not set. Running build without subscription."
Expand Down