Use vault for centos7 and remove centos6 build files

.circleci/test_docker_container.sh

@@ -21,10 +21,6 @@ conda list
 conda install --yes --quiet conda-forge-pinning -c conda-forge
 
 set +e
-conda info | grep "__glibc=2.12"
-exit_code="$?"
-if [[ "$exit_code" == 0 ]]; then
-  /usr/bin/sudo -n yum install -y mesa-libGL mesa-dri-drivers libselinux libXdamage libXxf86vm libXext libXfixes libXinerama libXrandr libXcursor libXcomposite libX11 libXi
-fi
+/usr/bin/sudo -n yum install mesa-libGL mesa-dri-drivers libselinux libXdamage libXxf86vm libXext
 
 touch /home/conda/feedstock_root/build_artifacts/conda-forge-build-done

.github/workflows/ci.yaml

@@ -17,12 +17,6 @@ jobs:
       fail-fast: false
       matrix:
         cfg:
-          - DOCKERIMAGE: linux-anvil-comp7
-            DOCKERTAG: latest
-            DISTRO_NAME: "centos"
-            DISTRO_VER: "6"
-            SHORT_DESCRIPTION: "conda-forge build image for Cent0S 6 on x86_64"
-
           - DOCKERIMAGE: linux-anvil-cos7-x86_64
             DOCKERTAG: latest
             DISTRO_NAME: "centos"

centos7-altarch-vault.repo

@@ -0,0 +1,27 @@
+[base]
+name=CentOS-7 - Base
+baseurl=https://vault.centos.org/altarch/7.9.2009/os/$basearch/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-AltArch-7-$basearch
+
+#released updates 
+[updates]
+name=CentOS-7 - Updates
+baseurl=https://vault.centos.org/altarch/7.9.2009/updates/$basearch/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-AltArch-7-$basearch
+
+#additional packages that may be useful
+[extras]
+name=CentOS-7 - Extras
+baseurl=https://vault.centos.org/altarch/7.9.2009/extras/$basearch/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-AltArch-7-$basearch
+
+#additional packages that extend functionality of existing packages
+[centosplus]
+name=CentOS-7 - Plus
+baseurl=https://vault.centos.org/altarch/7.9.2009/centosplus/$basearch/
+gpgcheck=1
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-AltArch-7-$basearch

centos7-x86_64-vault.repo

@@ -0,0 +1,27 @@
+[base]
+name=CentOS-7 - Base
+baseurl=https://vault.centos.org/7.9.2009/os/$basearch/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+
+#released updates 
+[updates]
+name=CentOS-7 - Updates
+baseurl=https://vault.centos.org/7.9.2009/updates/$basearch/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+
+#additional packages that may be useful
+[extras]
+name=CentOS-7 - Extras
+baseurl=https://vault.centos.org/7.9.2009/extras/$basearch/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+
+#additional packages that extend functionality of existing packages
+[centosplus]
+name=CentOS-7 - Plus
+baseurl=https://vault.centos.org/7.9.2009/centosplus/$basearch/
+gpgcheck=1
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7

linux-anvil-aarch64-cuda/Dockerfile

@@ -34,29 +34,14 @@ RUN ldconfig -v 2>/dev/null | grep -v ^$'\t' | cut -f1 -d":" >> /etc/ld.so.conf.
 # bust the docker cache so that we always rerun the installs below
 ADD https://loripsum.net/api /opt/docker/etc/gibberish
 
-# Resolves a nasty NOKEY warning that appears when using yum.
-# Naming convention changed with cos8 - see:
-# * https://lists.centos.org/pipermail/centos-devel/2019-September/017847.html
-# * https://www.centos.org/keys/#project-keys
-RUN if [ "${DISTRO_NAME}${DISTRO_VER}" = "centos7" ]; then \
-        rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 && \
-        rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-7-aarch64; \
-    elif [ "${DISTRO_NAME}${DISTRO_VER}" = "centos8" ]; then \
-        rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial; \
-    elif [ "${DISTRO_NAME}${DISTRO_VER}" = "ubi8" ]; then \
-        rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release; \
-    fi
-
 # Add custom `yum_clean_all` script before using `yum`
 COPY scripts/yum_clean_all /opt/docker/bin/
 
-# Fallback to CentOS vault for CentOS 8 support.
-RUN if [ "${DISTRO_NAME}${DISTRO_VER}" = "centos8" ]; then \
-        find /etc/yum.repos.d/ -name "CentOS-*.repo" -exec \
-             sed -i 's/mirrorlist/#mirrorlist/g;s|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' {} \; && \
-        yum update -y --disablerepo=cuda && \
-        /opt/docker/bin/yum_clean_all; \
-    fi
+# Add the archived repo URL and fix RPM imports
+ADD centos7-x86_64-vault.repo /tmp/centos7-x86_64-vault.repo
+ADD centos7-altarch-vault.repo /tmp/centos7-altarch-vault.repo
+ADD scripts/fix_rpm /opt/docker/bin/fix_rpm
+RUN /opt/docker/bin/fix_rpm
 
 # Install basic requirements.
 RUN yum update -y --disablerepo=cuda && \

linux-anvil-aarch64/Dockerfile

@@ -18,9 +18,11 @@ ENV LANGUAGE=en_US.UTF-8
 # bust the docker cache so that we always rerun the installs below
 ADD https://loripsum.net/api /opt/docker/etc/gibberish
 
-# Resolves a nasty NOKEY warning that appears when using yum.
-RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-${DISTRO_VER} && \
-    rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-${DISTRO_VER}-aarch64
+# Add the archived repo URL and fix RPM imports
+ADD centos7-x86_64-vault.repo /tmp/centos7-x86_64-vault.repo
+ADD centos7-altarch-vault.repo /tmp/centos7-altarch-vault.repo
+ADD scripts/fix_rpm /opt/docker/bin/fix_rpm
+RUN /opt/docker/bin/fix_rpm
 
 # (arm64v8/centos:7 only) Fix language override to get a working en_US.UTF-8 locale; backports:
 # https://github.com/CentOS/sig-cloud-instance-build/commit/2892c17fa8a520e58c3f42cd56587863fe675670

linux-anvil-alma/Dockerfile

@@ -23,8 +23,11 @@ ADD qemu-s390x-static /usr/bin/qemu-s390x-static
 # bust the docker cache so that we always rerun the installs below
 ADD https://loripsum.net/api /opt/docker/etc/gibberish
 
-# Resolves a nasty NOKEY warning that appears when using yum.
-RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+# Add the archived repo URL and fix RPM imports
+ADD centos7-x86_64-vault.repo /tmp/centos7-x86_64-vault.repo
+ADD centos7-altarch-vault.repo /tmp/centos7-altarch-vault.repo
+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/

linux-anvil-cos7-x86_64/Dockerfile

@@ -20,8 +20,11 @@ ADD qemu-s390x-static /usr/bin/qemu-s390x-static
 # bust the docker cache so that we always rerun the installs below
 ADD https://loripsum.net/api /opt/docker/etc/gibberish
 
-# Resolves a nasty NOKEY warning that appears when using yum.
-RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-${DISTRO_VER}
+# Add the archived repo URL and fix RPM imports
+ADD centos7-x86_64-vault.repo /tmp/centos7-x86_64-vault.repo
+ADD centos7-altarch-vault.repo /tmp/centos7-altarch-vault.repo
+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/

linux-anvil-cuda/Dockerfile

@@ -19,13 +19,6 @@ ENV LANG en_US.UTF-8
 # Set path to CUDA install (this is a symlink to /usr/local/cuda-${CUDA_VER})
 ENV CUDA_HOME /usr/local/cuda
 
-# Remove outdated repo URLs
-RUN if [[ "$DISTRO_VER" == "6" ]]; then rm -rf /etc/yum.repos.d/CentOS-*; fi
-# Add the archived centos6 repo URL
-ADD centos6-vault.repo /tmp/vault.repo
-RUN if [[ "$DISTRO_VER" == "6" ]]; then cp /tmp/vault.repo /etc/yum.repos.d/vault.repo; fi
-RUN rm /tmp/vault.repo
-
 # we want to persist a path in ldconfig (to avoid having to always set LD_LIBRARY_PATH), but *after* the existing entries;
 # since entries in ld.so.conf.d have precedence before the preconfigured directories, we first add the latter to the former
 RUN ldconfig -v 2>/dev/null | grep -v ^$'\t' | cut -f1 -d":" >> /etc/ld.so.conf.d/cuda-$CUDA_VER.conf \
@@ -50,8 +43,11 @@ RUN ldconfig -v 2>/dev/null | grep -v ^$'\t' | cut -f1 -d":" >> /etc/ld.so.conf.
 # bust the docker cache so that we always rerun the installs below
 ADD https://loripsum.net/api /opt/docker/etc/gibberish
 
-# Resolves a nasty NOKEY warning that appears when using yum.
-RUN find /etc/pki/rpm-gpg/ -type f | xargs -I {} rpm --import "{}"
+# Add the archived repo URL and fix RPM imports
+ADD centos7-x86_64-vault.repo /tmp/centos7-x86_64-vault.repo
+ADD centos7-altarch-vault.repo /tmp/centos7-altarch-vault.repo
+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/

linux-anvil-ppc64le-cuda/Dockerfile

@@ -67,13 +67,11 @@ RUN if [ "${DISTRO_NAME}${DISTRO_VER}" = "centos7" ]; then \
 # Add custom `yum_clean_all` script before using `yum`
 COPY scripts/yum_clean_all /opt/docker/bin/
 
-# Fallback to CentOS vault for CentOS 8 support.
-RUN if [ "${DISTRO_NAME}${DISTRO_VER}" = "centos8" ]; then \
-        find /etc/yum.repos.d/ -name "CentOS-*.repo" -exec \
-             sed -i 's/mirrorlist/#mirrorlist/g;s|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' {} \; && \
-        yum update -y --disablerepo=cuda && \
-        /opt/docker/bin/yum_clean_all; \
-    fi
+# Add the archived repo URL and fix RPM imports
+ADD centos7-x86_64-vault.repo /tmp/centos7-x86_64-vault.repo
+ADD centos7-altarch-vault.repo /tmp/centos7-altarch-vault.repo
+ADD scripts/fix_rpm /opt/docker/bin/fix_rpm
+RUN /opt/docker/bin/fix_rpm
 
 # Install basic requirements.
 RUN yum update -y --disablerepo=cuda && \

linux-anvil-ppc64le/Dockerfile

@@ -20,9 +20,11 @@ ENV LANGUAGE=en_US.UTF-8
 # bust the docker cache so that we always rerun the installs below
 ADD https://loripsum.net/api /opt/docker/etc/gibberish
 
-# Resolves a nasty NOKEY warning that appears when using yum.
-RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-${DISTRO_VER} && \
-    rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-AltArch-${DISTRO_VER}-ppc64le
+# Add the archived repo URL and fix RPM imports
+ADD centos7-x86_64-vault.repo /tmp/centos7-x86_64-vault.repo
+ADD centos7-altarch-vault.repo /tmp/centos7-altarch-vault.repo
+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/

scripts/fix_rpm

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+set -exo pipefail
+
+# Remove outdated repo URLs
+if [[ "$DISTRO_VER" == "7" ]]; then
+  rm -rf /etc/yum.repos.d/CentOS-*;
+  if [[ "$(uname -m)" == "x86_64" ]]; then
+    cp /tmp/centos7-x86_64-vault.repo /etc/yum.repos.d/vault.repo
+  else
+    cp /tmp/centos7-altarch-vault.repo /etc/yum.repos.d/vault.repo
+  fi
+
+  for f in /etc/yum.repos.d/*; do
+    cat $f
+  done
+fi
+
+# Resolves a nasty NOKEY warning that appears when using yum.
+if [[ "${DISTRO_NAME}${DISTRO_VER}" == "centos7" ]]; then \
+  rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 && \
+  if [[ "$(uname -m)" == "ppc64le" ]]; then
+    rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-AltArch-7-ppc64le;
+  elif [[ "$(uname -m)" == "aarch64" ]]; then
+    rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-AltArch-7-aarch64;
+  fi
+elif [[ "${DISTRO_NAME}${DISTRO_VER}" == "centos8" ]]; then \
+  rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial; \
+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

scripts/yum_clean_all

@@ -1,12 +1,5 @@
 #! /bin/sh -eu
 
 # (centos:6 only) If glibc-common is updated, we have to manually purge non-en_US locales.
-if grep -F 'CentOS release 6' /etc/centos-release ; then
-    if locale -a | grep nds_DE ; then
-        cp /usr/lib/locale/locale-archive /usr/lib/locale/locale-archive.tmpl
-        localedef -i en_US -f UTF-8 en_US.UTF-8
-        : > /usr/lib/locale/locale-archive.tmpl
-    fi
-fi
 yum clean all
 rm -rf /var/cache/yum/*