refactor

conda-forge · Oct 16, 2024 · 222a412 · 222a412
1 parent df5a83c
commit 222a412
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/ci.yaml b/.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-cos7
+            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-cos7
+            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-cos7
+            DOCKERFILE: linux-anvil
             DOCKERTAG: "8"
             DISTRO_ARCH: "ppc64le"
             DISTRO_NAME: "almalinux"

diff --git a/linux-anvil-cos7/Dockerfile → linux-anvil/Dockerfile b/linux-anvil-cos7/Dockerfile → linux-anvil/Dockerfile
@@ -33,7 +33,7 @@ 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
 

diff --git a/linux-anvil-cos7/entrypoint_source → linux-anvil/entrypoint_source b/linux-anvil-cos7/entrypoint_source → linux-anvil/entrypoint_source
diff --git a/centos7-repos/centos7-aarch64-vault.repo → rpm-repos/centos7-aarch64-vault.repo b/centos7-repos/centos7-aarch64-vault.repo → rpm-repos/centos7-aarch64-vault.repo
diff --git a/centos7-repos/centos7-ppc64le-vault.repo → rpm-repos/centos7-ppc64le-vault.repo b/centos7-repos/centos7-ppc64le-vault.repo → rpm-repos/centos7-ppc64le-vault.repo
diff --git a/centos7-repos/centos7-x86_64-vault.repo → rpm-repos/centos7-x86_64-vault.repo b/centos7-repos/centos7-x86_64-vault.repo → rpm-repos/centos7-x86_64-vault.repo
diff --git a/scripts/fix_rpm b/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
@@ -20,4 +20,4 @@ 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"