From af466712694cbe3a1da65e4e6ec7ce372441bfa7 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 25 Oct 2024 12:16:31 +1100 Subject: [PATCH 1/3] fix spelling of CentOS --- .github/workflows/ci.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0c48fa6..4df37ee 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -23,7 +23,7 @@ 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 @@ -31,7 +31,7 @@ jobs: 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 @@ -39,7 +39,7 @@ jobs: 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 From 22a53620249e2432ca91c547f3195a11327b41c3 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 25 Oct 2024 12:20:07 +1100 Subject: [PATCH 2/3] 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 From 5e3cc81fb46fb5d5b6b4eff489e3b35acedca2b6 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 12 Nov 2024 10:31:16 +1100 Subject: [PATCH 3/3] re-enable SHA1 on alma9 also use rpm key from alma server; in-container file (currently?) runs into ``` + rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux error: /etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux: import read failed(2). ``` --- scripts/fix_rpm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/fix_rpm b/scripts/fix_rpm index 05fa36e..0c44bf8 100755 --- a/scripts/fix_rpm +++ b/scripts/fix_rpm @@ -16,8 +16,13 @@ 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}" = "almalinux" ]; then +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"