Merge pull request #33 from SebastianAchilles/almalinux86

fix AlmaLinux 8.6 and CentOS 7.9 container
easybuilders · Nov 23, 2024 · 225a966 · 225a966
2 parents dfd69b7 + 19b5ddf
commit 225a966
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/almalinux-8.6/Dockerfile b/almalinux-8.6/Dockerfile
@@ -1,10 +1,10 @@
 FROM almalinux:8.6
 RUN useradd -ms /bin/bash easybuild
+# Add new AlmaLinux 8 GPG key, c.f. https://almalinux.org/blog/2023-12-20-almalinux-8-key-update/
+RUN rpm --import https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux
 # enable PowerTools repository, required by Lmod in EPEL
 RUN dnf -y install dnf-plugins-core && dnf config-manager --set-enabled powertools \
 && dnf -y install epel-release && dnf -y install python3 Lmod
-# Add new AlmaLinux 8 GPG key, c.f. https://almalinux.org/blog/2023-12-20-almalinux-8-key-update/
-RUN rpm --import https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux
 # glibc-langpack-en provides locale stuff (for en_US.UTF-8)
 RUN dnf -y install bzip2 curl diffutils file gcc-c++ git glibc-langpack-en gzip make openssl openssl-devel rdma-core-devel patch sudo tar unzip which xz
 RUN python3 -m pip install archspec
diff --git a/centos-7.9-python3/Dockerfile b/centos-7.9-python3/Dockerfile
@@ -1,5 +1,9 @@
 FROM centos:7.9.2009
 RUN useradd -ms /bin/bash easybuild
+# mirrorlist.centos.org doesn't exists anymore, update repo files
+RUN sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/CentOS-*.repo \
+  && sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/CentOS-*.repo \
+  && sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/CentOS-*.repo
 RUN yum -y install epel-release && yum -y install python3 python3-pip Lmod
 RUN yum -y install bzip2 curl diffutils file gcc-c++ git gzip make openssl openssl-devel rdma-core-devel patch sudo tar unzip which xz
 RUN yum -y update ca-certificates

diff --git a/centos-7.9/Dockerfile b/centos-7.9/Dockerfile
@@ -1,5 +1,9 @@
 FROM centos:7.9.2009
 RUN useradd -ms /bin/bash easybuild
+# mirrorlist.centos.org doesn't exists anymore, update repo files
+RUN sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/CentOS-*.repo \
+  && sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/CentOS-*.repo \
+  && sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/CentOS-*.repo
 RUN yum -y install epel-release && yum -y install python python2-pip Lmod
 RUN yum -y install bzip2 curl diffutils file gcc-c++ git gzip make openssl openssl-devel rdma-core-devel patch sudo tar unzip which xz
 RUN yum -y update ca-certificates