From ae9f2d4d408ada31aa463d4d0fc9a0fcf4268266 Mon Sep 17 00:00:00 2001
From: Jonathon Anderson <17242663+blue42u@users.noreply.github.com>
Date: Fri, 26 Apr 2024 20:02:04 -0500
Subject: containers: Add Fedora 40, 39 (#43847)

---
 share/spack/templates/container/fedora.dockerfile  | 29 ++++++++++++++++++++++
 .../spack/templates/container/fedora_37.dockerfile | 29 ----------------------
 .../spack/templates/container/fedora_38.dockerfile | 29 ----------------------
 3 files changed, 29 insertions(+), 58 deletions(-)
 create mode 100644 share/spack/templates/container/fedora.dockerfile
 delete mode 100644 share/spack/templates/container/fedora_37.dockerfile
 delete mode 100644 share/spack/templates/container/fedora_38.dockerfile

(limited to 'share')

diff --git a/share/spack/templates/container/fedora.dockerfile b/share/spack/templates/container/fedora.dockerfile
new file mode 100644
index 0000000000..4856ad2197
--- /dev/null
+++ b/share/spack/templates/container/fedora.dockerfile
@@ -0,0 +1,29 @@
+{% extends "container/bootstrap-base.dockerfile" %}
+{% block install_os_packages %}
+RUN dnf update -y \
+ && dnf install -y \
+        bzip2 \
+        curl \
+        file \
+        findutils \
+        gcc-c++ \
+        gcc \
+        gcc-gfortran \
+        git \
+        gnupg2 \
+        hg \
+        hostname \
+        iproute \
+        make \
+        patch \
+        python3 \
+        python3-pip \
+        python3-setuptools \
+        svn \
+        unzip \
+        xz \
+        zstd \
+ && pip3 install boto3 \
+ && 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
deleted file mode 100644
index 6cea1e0cd3..0000000000
--- a/share/spack/templates/container/fedora_37.dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-{% extends "container/bootstrap-base.dockerfile" %}
-{% block install_os_packages %}
-RUN dnf update -y \
- && dnf install -y \
-        bzip2 \
-        curl \
-        file \
-        findutils \
-        gcc-c++ \
-        gcc \
-        gcc-gfortran \
-        git \
-        gnupg2 \
-        hg \
-        hostname \
-        iproute \
-        make \
-        patch \
-        python3 \
-        python3-pip \
-        python3-setuptools \
-        svn \
-        unzip \
-        zstd \
-        xz \
- && pip3 install boto3 \
- && 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
deleted file mode 100644
index 4856ad2197..0000000000
--- a/share/spack/templates/container/fedora_38.dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-{% extends "container/bootstrap-base.dockerfile" %}
-{% block install_os_packages %}
-RUN dnf update -y \
- && dnf install -y \
-        bzip2 \
-        curl \
-        file \
-        findutils \
-        gcc-c++ \
-        gcc \
-        gcc-gfortran \
-        git \
-        gnupg2 \
-        hg \
-        hostname \
-        iproute \
-        make \
-        patch \
-        python3 \
-        python3-pip \
-        python3-setuptools \
-        svn \
-        unzip \
-        xz \
-        zstd \
- && pip3 install boto3 \
- && rm -rf /var/cache/dnf \
- && dnf clean all
-{% endblock %}
-- 
cgit v1.2.3-70-g09d2