From 49dcb2618a0076a894fa8cd589db7e2bcc142965 Mon Sep 17 00:00:00 2001
From: ZhengJin <fangzhengjin@gmail.com>
Date: Thu, 25 Aug 2022 13:21:45 +0800
Subject: [PATCH] fix: building AlmaLinux 9.0 repository iso

---
 hack/gen-repository-iso/dockerfile.almalinux90 | 9 ++++-----
 hack/gen-repository-iso/packages.yaml          | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/hack/gen-repository-iso/dockerfile.almalinux90 b/hack/gen-repository-iso/dockerfile.almalinux90
index dbc58b4b..a90c8b70 100644
--- a/hack/gen-repository-iso/dockerfile.almalinux90
+++ b/hack/gen-repository-iso/dockerfile.almalinux90
@@ -1,9 +1,8 @@
-FROM almalinux:9 as almalinux90
+FROM almalinux:9.0 as almalinux90
 ARG TARGETARCH
-ENV OS=almalinux
-ENV OS_VERSION=9.0
 ARG BUILD_TOOLS="dnf-plugins-core createrepo mkisofs epel-release"
-ARG DIR=${OS}-${OS_VERSION}-${TARGETARCH}-rpms
+ARG DIR=almalinux-9.0-${TARGETARCH}-rpms
+ARG PKGS=.common[],.rpms[],.almalinux[],.almalinux90[]
 
 RUN dnf install -q -y ${BUILD_TOOLS} \
     && dnf config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo \
@@ -12,7 +11,7 @@ RUN dnf install -q -y ${BUILD_TOOLS} \
 WORKDIR package
 COPY packages.yaml .
 COPY --from=mikefarah/yq:4.11.1 /usr/bin/yq /usr/bin/yq
-RUN yq eval ".common[],.rpms[],.${OS}[],.${OS}${OS_VERSION}[]" packages.yaml | sed '/^ceph-common$/d' > packages.list
+RUN yq eval ${PKGS} packages.yaml | sed '/^ceph-common$/d' > packages.list
 
 RUN sort -u packages.list | xargs dnf download --resolve --alldeps --downloaddir=${DIR} \
     && createrepo -d ${DIR} \
diff --git a/hack/gen-repository-iso/packages.yaml b/hack/gen-repository-iso/packages.yaml
index ada70bc1..1faa8a80 100644
--- a/hack/gen-repository-iso/packages.yaml
+++ b/hack/gen-repository-iso/packages.yaml
@@ -84,6 +84,6 @@ almalinux:
   - containerd.io
   - docker-compose-plugin
 
-almalinux9:
+almalinux90:
   - docker-ce-20.10.17
   - docker-ce-cli-20.10.17
\ No newline at end of file