Consolidate cos7 and alma8 docker files

conda-forge · Oct 16, 2024 · b020d1b · b020d1b
1 parent adaefb4
commit b020d1b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 62 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -69,23 +69,23 @@ jobs:
             SHORT_DESCRIPTION: "conda-forge build image for Cent0S 8 on aarch64 with CUDA"
 
           - DOCKERIMAGE: linux-anvil-alma-x86_64
-            DOCKERFILE: linux-anvil-alma
+            DOCKERFILE: linux-anvil-cos7
             DOCKERTAG: "8"
             DISTRO_ARCH: "amd64"
             DISTRO_NAME: "almalinux"
             DISTRO_VER: "8"
             SHORT_DESCRIPTION: "conda-forge build image for Alma 8 on x86_64"
 
           - DOCKERIMAGE: linux-anvil-alma-aarch64
-            DOCKERFILE: linux-anvil-alma
+            DOCKERFILE: linux-anvil-cos7
             DOCKERTAG: "8"
             DISTRO_ARCH: "arm64"
             DISTRO_NAME: "almalinux"
             DISTRO_VER: "8"
             SHORT_DESCRIPTION: "conda-forge build image for Alma 8 on aarch64"
 
           - DOCKERIMAGE: linux-anvil-alma-ppc64le
-            DOCKERFILE: linux-anvil-alma
+            DOCKERFILE: linux-anvil-cos7
             DOCKERTAG: "8"
             DISTRO_ARCH: "ppc64le"
             DISTRO_NAME: "almalinux"

diff --git a/linux-anvil-alma/Dockerfile b/linux-anvil-alma/Dockerfile
diff --git a/linux-anvil-alma/entrypoint_source b/linux-anvil-alma/entrypoint_source
diff --git a/linux-anvil-cos7/Dockerfile b/linux-anvil-cos7/Dockerfile
@@ -39,12 +39,16 @@ RUN /opt/docker/bin/fix_rpm
 
 # Install basic requirements.
 COPY scripts/yum_clean_all /opt/docker/bin/
-RUN yum update -y && \
+RUN if [ "${DISTRO_NAME}${DISTRO_VER}" = "almalinux8" ]; then \
+      EXTRA_YUM_PKGS="glibc-minimal-langpack glibc-langpack-en" \
+    fi \
+    yum update -y && \
     yum install -y \
         bzip2 \
         sudo \
         tar \
-        which && \
+        which \
+        ${EXTRA_YUM_PKGS:-} && \
     /opt/docker/bin/yum_clean_all
 
 # Run common commands

diff --git a/scripts/fix_rpm b/scripts/fix_rpm
@@ -16,6 +16,8 @@ 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
+  rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
 fi
 
 rm -rf "/tmp/centos7-repos"