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 /lib | |
| 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 'lib')
| -rw-r--r-- | lib/spack/docs/containers.rst | 2 | ||||
| -rw-r--r-- | lib/spack/spack/container/images.json | 24 |
2 files changed, 18 insertions, 8 deletions
diff --git a/lib/spack/docs/containers.rst b/lib/spack/docs/containers.rst index 9ff4039147..ec9c02635c 100644 --- a/lib/spack/docs/containers.rst +++ b/lib/spack/docs/containers.rst @@ -636,7 +636,7 @@ to customize the generation of container recipes: - No * - ``os_packages:command`` - Tool used to manage system packages - - ``apt``, ``yum``, ``zypper``, ``apk``, ``yum_amazon`` + - ``apt``, ``yum``, ``dnf``, ``dnf_epel``, ``zypper``, ``apk``, ``yum_amazon`` - Only with custom base images * - ``os_packages:update`` - Whether or not to update the list of available packages diff --git a/lib/spack/spack/container/images.json b/lib/spack/spack/container/images.json index 296658fe5e..8bf11ace93 100644 --- a/lib/spack/spack/container/images.json +++ b/lib/spack/spack/container/images.json @@ -17,7 +17,7 @@ "template": "container/fedora_38.dockerfile", "image": "docker.io/fedora:38" }, - "os_package_manager": "yum", + "os_package_manager": "dnf", "build": "spack/fedora38", "build_tags": { "develop": "latest" @@ -31,7 +31,7 @@ "template": "container/fedora_37.dockerfile", "image": "docker.io/fedora:37" }, - "os_package_manager": "yum", + "os_package_manager": "dnf", "build": "spack/fedora37", "build_tags": { "develop": "latest" @@ -45,7 +45,7 @@ "template": "container/rockylinux_9.dockerfile", "image": "docker.io/rockylinux:9" }, - "os_package_manager": "yum", + "os_package_manager": "dnf_epel", "build": "spack/rockylinux9", "build_tags": { "develop": "latest" @@ -59,7 +59,7 @@ "template": "container/rockylinux_8.dockerfile", "image": "docker.io/rockylinux:8" }, - "os_package_manager": "yum", + "os_package_manager": "dnf_epel", "build": "spack/rockylinux8", "build_tags": { "develop": "latest" @@ -73,7 +73,7 @@ "template": "container/almalinux_9.dockerfile", "image": "quay.io/almalinux/almalinux:9" }, - "os_package_manager": "yum", + "os_package_manager": "dnf_epel", "build": "spack/almalinux9", "build_tags": { "develop": "latest" @@ -87,7 +87,7 @@ "template": "container/almalinux_8.dockerfile", "image": "quay.io/almalinux/almalinux:8" }, - "os_package_manager": "yum", + "os_package_manager": "dnf_epel", "build": "spack/almalinux8", "build_tags": { "develop": "latest" @@ -101,7 +101,7 @@ "template": "container/centos_stream.dockerfile", "image": "quay.io/centos/centos:stream" }, - "os_package_manager": "yum", + "os_package_manager": "dnf_epel", "build": "spack/centos-stream", "final": { "image": "quay.io/centos/centos:stream" @@ -185,6 +185,16 @@ "install": "apt-get -yqq install", "clean": "rm -rf /var/lib/apt/lists/*" }, + "dnf": { + "update": "dnf update -y", + "install": "dnf install -y", + "clean": "rm -rf /var/cache/dnf && dnf clean all" + }, + "dnf_epel": { + "update": "dnf update -y && dnf install -y epel-release && dnf update -y", + "install": "dnf install -y", + "clean": "rm -rf /var/cache/dnf && dnf clean all" + }, "yum": { "update": "yum update -y && yum install -y epel-release && yum update -y", "install": "yum install -y", |