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)

---
 lib/spack/docs/containers.rst         |  6 ++++++
 lib/spack/spack/container/images.json | 26 ++++++++++++++++++++++++--
 2 files changed, 30 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/spack/docs/containers.rst b/lib/spack/docs/containers.rst
index 50d96f6537..25ad22525e 100644
--- a/lib/spack/docs/containers.rst
+++ b/lib/spack/docs/containers.rst
@@ -233,6 +233,12 @@ The OS that are currently supported are summarized in the table below:
    * - Fedora Linux 38
      - ``fedora:38``
      - ``spack/fedora38``
+   * - Fedora Linux 39
+     - ``fedora:39``
+     - ``spack/fedora39``
+   * - Fedora Linux 40
+     - ``fedora:40``
+     - ``spack/fedora40``
 
 
 
diff --git a/lib/spack/spack/container/images.json b/lib/spack/spack/container/images.json
index b78b180333..e91f369547 100644
--- a/lib/spack/spack/container/images.json
+++ b/lib/spack/spack/container/images.json
@@ -12,9 +12,31 @@
       },
       "os_package_manager": "yum_amazon"
     },
+    "fedora:40": {
+      "bootstrap": {
+        "template": "container/fedora.dockerfile",
+        "image": "docker.io/fedora:40"
+      },
+      "os_package_manager": "dnf",
+      "build": "spack/fedora40",
+      "final": {
+        "image": "docker.io/fedora:40"
+      }
+    },
+    "fedora:39": {
+      "bootstrap": {
+        "template": "container/fedora.dockerfile",
+        "image": "docker.io/fedora:39"
+      },
+      "os_package_manager": "dnf",
+      "build": "spack/fedora39",
+      "final": {
+        "image": "docker.io/fedora:39"
+      }
+    },
     "fedora:38": {
       "bootstrap": {
-        "template": "container/fedora_38.dockerfile",
+        "template": "container/fedora.dockerfile",
         "image": "docker.io/fedora:38"
       },
       "os_package_manager": "dnf",
@@ -25,7 +47,7 @@
     },
     "fedora:37": {
       "bootstrap": {
-        "template": "container/fedora_37.dockerfile",
+        "template": "container/fedora.dockerfile",
         "image": "docker.io/fedora:37"
       },
       "os_package_manager": "dnf",
-- 
cgit v1.2.3-70-g09d2