Consolidate cos7 and alma8 docker files

.github/workflows/ci.yaml

@@ -18,23 +18,23 @@ jobs:
       matrix:
         cfg:
           - DOCKERIMAGE: linux-anvil-cos7-x86_64
-            DOCKERFILE: linux-anvil-cos7
+            DOCKERFILE: linux-anvil
             DOCKERTAG: latest
             DISTRO_ARCH: "amd64"
             DISTRO_NAME: "centos"
             DISTRO_VER: "7"
             SHORT_DESCRIPTION: "conda-forge build image for Cent0S 7 on x86_64"
 
           - DOCKERIMAGE: linux-anvil-ppc64le
-            DOCKERFILE: linux-anvil-cos7
+            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"
 
           - DOCKERIMAGE: linux-anvil-aarch64
-            DOCKERFILE: linux-anvil-cos7
+            DOCKERFILE: linux-anvil
             DOCKERTAG: latest
             DISTRO_ARCH: "arm64"
             DISTRO_NAME: "centos"
@@ -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
             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
             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
             DOCKERTAG: "8"
             DISTRO_ARCH: "ppc64le"
             DISTRO_NAME: "almalinux"

linux-anvil-cuda/Dockerfile

@@ -41,7 +41,7 @@ RUN ldconfig -v 2>/dev/null | grep -v ^$'\t' | cut -f1 -d":" >> /etc/ld.so.conf.
     ldconfig
 
 # Add the archived repo URL and fix RPM imports
-ADD centos7-repos /tmp/centos7-repos
+ADD rpm-repos /tmp/rpm-repos
 ADD scripts/fix_rpm /opt/docker/bin/fix_rpm
 RUN /opt/docker/bin/fix_rpm
 

linux-anvil-cos7/Dockerfile → linux-anvil/Dockerfile

@@ -33,18 +33,22 @@ RUN if [ "${DISTRO_ARCH}" = "arm64" ] && [ "${DISTRO_NAME}${DISTRO_VER}" = "cent
     fi
 
 # Add the archived repo URL and fix RPM imports
-ADD centos7-repos /tmp/centos7-repos
+ADD rpm-repos /tmp/rpm-repos
 ADD scripts/fix_rpm /opt/docker/bin/fix_rpm
 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
@@ -54,7 +58,7 @@ RUN /opt/docker/bin/run_commands
 # Add a file for users to source to activate the `conda`
 # environment `base`. Also add a file that wraps that for
 # use with the `ENTRYPOINT`.
-COPY linux-anvil-cos7/entrypoint_source /opt/docker/bin/entrypoint_source
+COPY linux-anvil/entrypoint_source /opt/docker/bin/entrypoint_source
 COPY scripts/entrypoint /opt/docker/bin/entrypoint
 
 # Ensure that all containers start with tini and the user selected process.

scripts/fix_rpm

@@ -5,7 +5,7 @@ set -exo pipefail
 if [[ "${DISTRO_NAME}${DISTRO_VER}" == "centos7" ]]; then
   # Disable outdated repos; use vault instead
   sed -i '/^enabled=/d; /^\[/a\enabled=0' /etc/yum.repos.d/CentOS-Base.repo
-  cp "/tmp/centos7-repos/centos7-$(uname -m)-vault.repo" /etc/yum.repos.d/vault.repo
+  cp "/tmp/rpm-repos/centos7-$(uname -m)-vault.repo" /etc/yum.repos.d/vault.repo
 
   # Resolves a nasty NOKEY warning that appears when using yum.
   rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
@@ -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"
+rm -rf "/tmp/rpm-repos"