Merge branch 'main' into ubuntu2404

easybuilders · May 15, 2024 · 0e3ba63 · 0e3ba63
2 parents 03c4739 + 7c996bb
commit 0e3ba63
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/almalinux-8.6/Dockerfile b/almalinux-8.6/Dockerfile
@@ -3,6 +3,8 @@ RUN useradd -ms /bin/bash easybuild
 # 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/Dockerfile b/centos-7.9/Dockerfile
@@ -4,4 +4,4 @@ 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
 # In order to install archspec we need to upgrade pip to latest version for Python 2
-RUN python -m pip install --upgrade 'pip<21' && python -m pip install archspec
+RUN python -m pip install --trusted-host pypi.python.org --trusted-host files.pythonhosted.org --trusted-host pypi.org --upgrade 'pip<21' && python -m pip install archspec