From 404f4e935270fd1eb79936a2411156fdadb04f41 Mon Sep 17 00:00:00 2001
From: Tim Weiers <weiers@ualberta.ca>
Date: Tue, 10 Dec 2024 21:06:04 +0000
Subject: [PATCH 1/3] Add ubuntu 24.04 support

---
 ubuntu-24/Containerfile     | 33 +++++++++++++++++++++++++++++++++
 ubuntu-24/container_exit.sh |  6 ++++++
 ubuntu-24/excludes          |  1 +
 3 files changed, 40 insertions(+)
 create mode 100644 ubuntu-24/Containerfile
 create mode 100755 ubuntu-24/container_exit.sh
 create mode 100644 ubuntu-24/excludes

diff --git a/ubuntu-24/Containerfile b/ubuntu-24/Containerfile
new file mode 100644
index 0000000..ce60b1a
--- /dev/null
+++ b/ubuntu-24/Containerfile
@@ -0,0 +1,33 @@
+FROM ubuntu:24.04
+
+
+# ----- install vital packages -----
+ENV DEBIAN_FRONTEND teletype
+RUN apt-get update && apt-get install -y --no-install-recommends \
+	apt-utils \
+	kmod \
+	systemd-sysv \
+	dbus \
+	openssh-client \
+	openssh-server \
+	isc-dhcp-client \
+	pciutils \
+	strace \
+	nfs-common \
+	ethtool\
+	linux-image-generic \
+	ifupdown \
+	ifmetric \
+	netbase && \
+	apt-get autoremove -y && \
+	rm -rf /var/lib/apt/lists/*
+
+
+COPY excludes /etc/warewulf/
+COPY container_exit.sh /etc/warewulf/
+
+CMD [ "/bin/echo", "-e", \
+      "This image is intended to be used with the Warewulf cluster management and", \
+      "\nprovisioning system.", \
+      "\n", \
+      "\nFor more information about Warewulf, visit https://warewulf.org" ]
diff --git a/ubuntu-24/container_exit.sh b/ubuntu-24/container_exit.sh
new file mode 100755
index 0000000..11ce88f
--- /dev/null
+++ b/ubuntu-24/container_exit.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+set -x
+LANG=C
+LC_CTYPE=C
+export LANG LC_CTYPE
+apt-get clean
diff --git a/ubuntu-24/excludes b/ubuntu-24/excludes
new file mode 100644
index 0000000..5be2a7e
--- /dev/null
+++ b/ubuntu-24/excludes
@@ -0,0 +1 @@
+/boot/

From 71662dfc8a6c74d17384f46750c16f99594b5bd1 Mon Sep 17 00:00:00 2001
From: Tim Weiers <weiers@ualberta.ca>
Date: Wed, 11 Dec 2024 17:51:13 +0000
Subject: [PATCH 2/3] Update github workflow to include building 24.04 images.

---
 .github/workflows/container-publish.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/container-publish.yml b/.github/workflows/container-publish.yml
index c2f8acf..021dfd4 100644
--- a/.github/workflows/container-publish.yml
+++ b/.github/workflows/container-publish.yml
@@ -87,6 +87,10 @@ jobs:
             version: "12.0"
             context: debian
             file: debian/Containerfile-12.0
+          - os: ubuntu
+            version: "24.04"
+            context: ubuntu-24.04
+            file: ubuntu-24/Containerfile
 
     permissions:
       contents: read

From c8b525a737362efccbaffa572daf41a5b36a70b0 Mon Sep 17 00:00:00 2001
From: Tim Weiers <weiers@ualberta.ca>
Date: Thu, 12 Dec 2024 00:02:50 +0000
Subject: [PATCH 3/3] Fix content path

---
 .github/workflows/container-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/container-publish.yml b/.github/workflows/container-publish.yml
index 021dfd4..f1ff50f 100644
--- a/.github/workflows/container-publish.yml
+++ b/.github/workflows/container-publish.yml
@@ -89,7 +89,7 @@ jobs:
             file: debian/Containerfile-12.0
           - os: ubuntu
             version: "24.04"
-            context: ubuntu-24.04
+            context: ubuntu-24
             file: ubuntu-24/Containerfile
 
     permissions: