From 22a53620249e2432ca91c547f3195a11327b41c3 Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <h.vetinari@gmx.com>
Date: Fri, 25 Oct 2024 12:20:07 +1100
Subject: [PATCH] add alma 9 images

---
 .github/workflows/ci.yaml | 24 ++++++++++++++++++++++++
 linux-anvil/Dockerfile    |  2 +-
 scripts/fix_rpm           |  2 +-
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 4df37ee..86315d2 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -92,6 +92,30 @@ jobs:
             DISTRO_VER: "8"
             SHORT_DESCRIPTION: "conda-forge build image for Alma 8 on ppc64le"
 
+          - DOCKERIMAGE: linux-anvil-alma-x86_64
+            DOCKERFILE: linux-anvil
+            DOCKERTAG: "9"
+            DISTRO_ARCH: "amd64"
+            DISTRO_NAME: "almalinux"
+            DISTRO_VER: "9"
+            SHORT_DESCRIPTION: "conda-forge build image for Alma 9 on x86_64"
+
+          - DOCKERIMAGE: linux-anvil-alma-aarch64
+            DOCKERFILE: linux-anvil
+            DOCKERTAG: "9"
+            DISTRO_ARCH: "arm64"
+            DISTRO_NAME: "almalinux"
+            DISTRO_VER: "9"
+            SHORT_DESCRIPTION: "conda-forge build image for Alma 9 on aarch64"
+
+          - DOCKERIMAGE: linux-anvil-alma-ppc64le
+            DOCKERFILE: linux-anvil
+            DOCKERTAG: "9"
+            DISTRO_ARCH: "ppc64le"
+            DISTRO_NAME: "almalinux"
+            DISTRO_VER: "9"
+            SHORT_DESCRIPTION: "conda-forge build image for Alma 9 on ppc64le"
+
     env:
       DOCKERIMAGE: ${{ matrix.cfg.DOCKERIMAGE }}
       DOCKERFILE: ${{ matrix.cfg.DOCKERFILE }}
diff --git a/linux-anvil/Dockerfile b/linux-anvil/Dockerfile
index fe22d0e..2016d00 100644
--- a/linux-anvil/Dockerfile
+++ b/linux-anvil/Dockerfile
@@ -39,7 +39,7 @@ RUN /opt/docker/bin/fix_rpm
 
 # Install basic requirements.
 COPY scripts/yum_clean_all /opt/docker/bin/
-RUN if [ "${DISTRO_NAME}${DISTRO_VER}" = "almalinux8" ]; then \
+RUN if [ "${DISTRO_NAME}" = "almalinux" ]; then \
       EXTRA_YUM_PKGS="glibc-minimal-langpack glibc-langpack-en"; \
     fi && \
     yum update -y && \
diff --git a/scripts/fix_rpm b/scripts/fix_rpm
index d55f880..05fa36e 100755
--- a/scripts/fix_rpm
+++ b/scripts/fix_rpm
@@ -16,7 +16,7 @@ if [[ "${DISTRO_NAME}${DISTRO_VER}" == "centos7" ]]; then
   fi
 elif [ "${DISTRO_NAME}${DISTRO_VER}" = "ubi8" ]; then
   rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
-elif [ "${DISTRO_NAME}${DISTRO_VER}" = "almalinux8" ]; then
+elif [ "${DISTRO_NAME}" = "almalinux" ]; then
   rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 fi