zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

containers: don't install epel-release on Fedora (#37766)

Browse Source
This commit is contained in:
Jonathon Anderson
2023-06-06 15:50:46 -04:00
committed by GitHub
parent 268649654d
commit f41446258a
9 changed files with 54 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
share/spack/templates/container/almalinux_8.dockerfile
View File

@@ -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 %}

12
share/spack/templates/container/almalinux_9.dockerfile
View File

@@ -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 %}

16
share/spack/templates/container/centos_stream.dockerfile
View File

@@ -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 %}

8
share/spack/templates/container/fedora_37.dockerfile
View File

@@ -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 %}

8
share/spack/templates/container/fedora_38.dockerfile
View File

@@ -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 %}

8
share/spack/templates/container/rockylinux_8.dockerfile
View File

@@ -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 %}

12
share/spack/templates/container/rockylinux_9.dockerfile
View File

@@ -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 %}