Merge pull request #290 from h-vetinari/alma9

Add alma9 images
conda-forge · Nov 12, 2024 · b90a502 · b90a502
2 parents 2a401fc + 5e3cc81
commit b90a502
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 7 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -23,23 +23,23 @@ jobs:
             DISTRO_ARCH: "amd64"
             DISTRO_NAME: "centos"
             DISTRO_VER: "7"
-            SHORT_DESCRIPTION: "conda-forge build image for Cent0S 7 on x86_64"
+            SHORT_DESCRIPTION: "conda-forge build image for CentOS 7 on x86_64"
 
           - DOCKERIMAGE: linux-anvil-ppc64le
             DOCKERFILE: linux-anvil
             DOCKERTAG: latest
             DISTRO_ARCH: "ppc64le"
             DISTRO_NAME: "centos"
             DISTRO_VER: "7"
-            SHORT_DESCRIPTION: "conda-forge build image for Cent0S 7 on ppc64le"
+            SHORT_DESCRIPTION: "conda-forge build image for CentOS 7 on ppc64le"
 
           - DOCKERIMAGE: linux-anvil-aarch64
             DOCKERFILE: linux-anvil
             DOCKERTAG: latest
             DISTRO_ARCH: "arm64"
             DISTRO_NAME: "centos"
             DISTRO_VER: "7"
-            SHORT_DESCRIPTION: "conda-forge build image for Cent0S 7 on aarch64"
+            SHORT_DESCRIPTION: "conda-forge build image for CentOS 7 on aarch64"
 
           - DOCKERIMAGE: linux-anvil-cuda
             DOCKERFILE: linux-anvil-cuda
@@ -48,7 +48,7 @@ jobs:
             DISTRO_ARCH: "amd64"
             DISTRO_NAME: "centos"
             DISTRO_VER: "7"
-            SHORT_DESCRIPTION: "conda-forge build image for Cent0S 7 on x86_64 with CUDA"
+            SHORT_DESCRIPTION: "conda-forge build image for CentOS 7 on x86_64 with CUDA"
 
           - DOCKERIMAGE: linux-anvil-ppc64le-cuda
             DOCKERFILE: linux-anvil-cuda
@@ -57,7 +57,7 @@ jobs:
             DISTRO_ARCH: "ppc64le"
             DISTRO_NAME: "ubi"
             DISTRO_VER: "8"
-            SHORT_DESCRIPTION: "conda-forge build image for Cent0S 8 on ppc64le with CUDA"
+            SHORT_DESCRIPTION: "conda-forge build image for CentOS 8 on ppc64le with CUDA"
 
           - DOCKERIMAGE: linux-anvil-aarch64-cuda
             DOCKERFILE: linux-anvil-cuda
@@ -66,7 +66,7 @@ jobs:
             DISTRO_ARCH: "arm64"
             DISTRO_NAME: "ubi"
             DISTRO_VER: "8"
-            SHORT_DESCRIPTION: "conda-forge build image for Cent0S 8 on aarch64 with CUDA"
+            SHORT_DESCRIPTION: "conda-forge build image for CentOS 8 on aarch64 with CUDA"
 
           - DOCKERIMAGE: linux-anvil-alma-x86_64
             DOCKERFILE: linux-anvil
@@ -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
@@ -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
@@ -18,6 +18,11 @@ 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
   rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+elif [ "${DISTRO_NAME}${DISTRO_VER}" = "almalinux9" ]; then
+  # alma9 removed SHA1 availability by default, but it's still needed for the
+  # RPM key; re-enable it. Details: https://access.redhat.com/articles/3666211
+  update-crypto-policies --set LEGACY
+  rpm --import https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux
 fi
 
 rm -rf "/tmp/rpm-repos"