Skip to content

Commit cfc7986

Browse files
authored
Merge pull request #264 from vvoland/rhel10
Add RHEL 10
2 parents 972519b + bb960e5 commit cfc7986

File tree

2 files changed

+22
-1
lines changed

2 files changed

+22
-1
lines changed

docker-bake.hcl

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ variable "DISTROS" {
3737
"oraclelinux9",
3838
"rhel8",
3939
"rhel9",
40+
"rhel10",
4041
"rockylinux8",
4142
"rockylinux9"
4243
]
@@ -405,6 +406,18 @@ target "_distro-rhel9" {
405406
}
406407
}
407408

409+
target "_distro-rhel10" {
410+
args = {
411+
DISTRO_NAME = "rhel10"
412+
DISTRO_TYPE = "rpm"
413+
DISTRO_RELEASE = "rhel"
414+
DISTRO_ID = "10"
415+
DISTRO_SUITE = "10"
416+
DISTRO_IMAGE = DISTRO_IMAGE != null && DISTRO_IMAGE != "" ? DISTRO_IMAGE : "registry.access.redhat.com/ubi10/ubi"
417+
TEST_ONLY = "0"
418+
}
419+
}
420+
408421
target "_distro-rockylinux8" {
409422
args = {
410423
DISTRO_NAME = "rockylinux8"

hack/scripts/rpm-init.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,16 @@ case "$pkgrelease" in
6363
dnf install -y git rpm-build rpmlint dnf-plugins-core epel-release
6464
dnf config-manager --set-enabled crb
6565
;;
66-
rhel*)
66+
rhel8|rhel9)
6767
dnf install -y git rpm-build rpmlint dnf-plugins-core
68+
;;
69+
rhel*)
70+
dnf install -y git rpm-build dnf-plugins-core
71+
;;
72+
esac
73+
74+
case "$pkgrelease" in
75+
rhel*)
6876
rm -f /etc/rhsm-host
6977
if [ -z "$RH_USER" ] || [ -z "$RH_PASS" ]; then
7078
echo "Either RH_USER or RH_PASS is not set. Running build without subscription."

0 commit comments

Comments
 (0)