diff options
| author | Jonathon Anderson <17242663+blue42u@users.noreply.github.com> | 2023-06-06 15:50:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-06 21:50:46 +0200 |
| commit | f41446258a23ff238d1d92a2e6b373dcfbe1feb1 (patch) | |
| tree | 5e803cd001f1f5aecc13eba02d8d02d8afca5c11 /share | |
| parent | 268649654db48e18ad5d860a229dae74cc664084 (diff) | |
| download | spack-f41446258a23ff238d1d92a2e6b373dcfbe1feb1.tar.gz spack-f41446258a23ff238d1d92a2e6b373dcfbe1feb1.tar.bz2 spack-f41446258a23ff238d1d92a2e6b373dcfbe1feb1.tar.xz spack-f41446258a23ff238d1d92a2e6b373dcfbe1feb1.zip | |
containers: don't install epel-release on Fedora (#37766)
Diffstat (limited to 'share')
7 files changed, 36 insertions, 36 deletions
diff --git a/share/spack/templates/container/almalinux_8.dockerfile b/share/spack/templates/container/almalinux_8.dockerfile index 13009d2796..b0070e9332 100644 --- a/share/spack/templates/container/almalinux_8.dockerfile +++ b/share/spack/templates/container/almalinux_8.dockerfile @@ -1,7 +1,7 @@ {% extends "container/bootstrap-base.dockerfile" %} {% block install_os_packages %} -RUN yum update -y \ - && yum install -y \ +RUN dnf update -y \ + && dnf install -y \ bzip2 \ curl \ file \ @@ -23,6 +23,6 @@ RUN yum update -y \ unzip \ zstd \ && pip3 install boto3 \ - && rm -rf /var/cache/yum \ - && yum clean all + && rm -rf /var/cache/dnf \ + && dnf clean all {% endblock %} diff --git a/share/spack/templates/container/almalinux_9.dockerfile b/share/spack/templates/container/almalinux_9.dockerfile index a8944532e0..8eb4ed9012 100644 --- a/share/spack/templates/container/almalinux_9.dockerfile +++ b/share/spack/templates/container/almalinux_9.dockerfile @@ -1,9 +1,9 @@ {% extends "container/bootstrap-base.dockerfile" %} {% block install_os_packages %} -RUN yum update -y \ - && yum install -y epel-release \ - && yum update -y \ - && yum --enablerepo epel install -y \ +RUN dnf update -y \ + && dnf install -y epel-release \ + && dnf update -y \ + && dnf --enablerepo epel install -y \ bzip2 \ curl-minimal \ file \ @@ -25,6 +25,6 @@ RUN yum update -y \ unzip \ zstd \ && pip3 install boto3 \ - && rm -rf /var/cache/yum \ - && yum clean all + && rm -rf /var/cache/dnf \ + && dnf clean all {% endblock %} diff --git a/share/spack/templates/container/centos_stream.dockerfile b/share/spack/templates/container/centos_stream.dockerfile index 48deb14673..292d76d73c 100644 --- a/share/spack/templates/container/centos_stream.dockerfile +++ b/share/spack/templates/container/centos_stream.dockerfile @@ -1,13 +1,13 @@ {% extends "container/bootstrap-base.dockerfile" %} {% block install_os_packages %} -RUN yum update -y \ +RUN dnf update -y \ # See https://fedoraproject.org/wiki/EPEL#Quickstart for powertools - && yum install -y dnf-plugins-core \ + && dnf install -y dnf-plugins-core \ && dnf config-manager --set-enabled powertools \ - && yum install -y epel-release \ - && yum update -y \ - && yum --enablerepo epel groupinstall -y "Development Tools" \ - && yum --enablerepo epel install -y \ + && dnf install -y epel-release \ + && dnf update -y \ + && dnf --enablerepo epel groupinstall -y "Development Tools" \ + && dnf --enablerepo epel install -y \ curl \ findutils \ gcc-c++ \ @@ -24,6 +24,6 @@ RUN yum update -y \ python38-setuptools \ unzip \ && pip3 install boto3 \ - && rm -rf /var/cache/yum \ - && yum clean all + && rm -rf /var/cache/dnf \ + && dnf clean all {% endblock %} diff --git a/share/spack/templates/container/fedora_37.dockerfile b/share/spack/templates/container/fedora_37.dockerfile index e1f0570b43..6cea1e0cd3 100644 --- a/share/spack/templates/container/fedora_37.dockerfile +++ b/share/spack/templates/container/fedora_37.dockerfile @@ -1,7 +1,7 @@ {% extends "container/bootstrap-base.dockerfile" %} {% block install_os_packages %} -RUN yum update -y \ - && yum install -y \ +RUN dnf update -y \ + && dnf install -y \ bzip2 \ curl \ file \ @@ -24,6 +24,6 @@ RUN yum update -y \ zstd \ xz \ && pip3 install boto3 \ - && rm -rf /var/cache/yum \ - && yum clean all + && rm -rf /var/cache/dnf \ + && dnf clean all {% endblock %} diff --git a/share/spack/templates/container/fedora_38.dockerfile b/share/spack/templates/container/fedora_38.dockerfile index a691da9444..4856ad2197 100644 --- a/share/spack/templates/container/fedora_38.dockerfile +++ b/share/spack/templates/container/fedora_38.dockerfile @@ -1,7 +1,7 @@ {% extends "container/bootstrap-base.dockerfile" %} {% block install_os_packages %} -RUN yum update -y \ - && yum install -y \ +RUN dnf update -y \ + && dnf install -y \ bzip2 \ curl \ file \ @@ -24,6 +24,6 @@ RUN yum update -y \ xz \ zstd \ && pip3 install boto3 \ - && rm -rf /var/cache/yum \ - && yum clean all + && rm -rf /var/cache/dnf \ + && dnf clean all {% endblock %} diff --git a/share/spack/templates/container/rockylinux_8.dockerfile b/share/spack/templates/container/rockylinux_8.dockerfile index a691da9444..4856ad2197 100644 --- a/share/spack/templates/container/rockylinux_8.dockerfile +++ b/share/spack/templates/container/rockylinux_8.dockerfile @@ -1,7 +1,7 @@ {% extends "container/bootstrap-base.dockerfile" %} {% block install_os_packages %} -RUN yum update -y \ - && yum install -y \ +RUN dnf update -y \ + && dnf install -y \ bzip2 \ curl \ file \ @@ -24,6 +24,6 @@ RUN yum update -y \ xz \ zstd \ && pip3 install boto3 \ - && rm -rf /var/cache/yum \ - && yum clean all + && rm -rf /var/cache/dnf \ + && dnf clean all {% endblock %} diff --git a/share/spack/templates/container/rockylinux_9.dockerfile b/share/spack/templates/container/rockylinux_9.dockerfile index 54c2200cbb..8fa568d6c6 100644 --- a/share/spack/templates/container/rockylinux_9.dockerfile +++ b/share/spack/templates/container/rockylinux_9.dockerfile @@ -1,9 +1,9 @@ {% extends "container/bootstrap-base.dockerfile" %} {% block install_os_packages %} -RUN yum update -y \ - && yum install -y epel-release \ - && yum update -y \ - && yum --enablerepo epel install -y \ +RUN dnf update -y \ + && dnf install -y epel-release \ + && dnf update -y \ + && dnf --enablerepo epel install -y \ bzip2 \ curl-minimal \ file \ @@ -26,6 +26,6 @@ RUN yum update -y \ xz \ zstd \ && pip3 install boto3 \ - && rm -rf /var/cache/yum \ - && yum clean all + && rm -rf /var/cache/dnf \ + && dnf clean all {% endblock %} |