Upgrade node images

.github/workflows/container-publish.yml

@@ -98,23 +98,39 @@ jobs:
           - os: leap
             version: "15"
             context: leap
-            file: leap/Containerfile.15
+            file: leap/Containerfile-15
           - os: leap
-            version: latest
+            version: "16"
+            context: leap
+            file: leap/Containerfile-16.0
+          - os: leap
+            version: "16.0"
             context: leap
-            file: leap/Containerfile
+            file: leap/Containerfile-16.0
           - os: tumbleweed
             version: latest
             context: tumbleweed
             file: tumbleweed/Containerfile
           - os: debian
-            version: "12.0"
+            version: "12"
+            context: debian
+            file: debian/Containerfile-12
+          - os: debian
+            version: "13"
             context: debian
-            file: debian/Containerfile-12.0
+            file: debian/Containerfile-13
           - os: openeuler
             version: "24.03"
             context: openeuler-24.03
             file: openeuler-24.03/Containerfile
+          - os: ubuntu
+            version: "24.04"
+            context: ubuntu
+            file: ubuntu/Containerfile-24.04
+          - os: ubuntu
+            version: "26.04"
+            context: ubuntu
+            file: ubuntu/Containerfile-26.04
 
     permissions:
       contents: read
@@ -126,7 +142,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
 
       - name: Make Containerfiles
         run: |
@@ -145,13 +161,13 @@ jobs:
 
       # Workaround: https://github.com/docker/build-push-action/issues/461
       - name: Setup Docker buildx
-        uses: docker/setup-buildx-action@f03ac48505955848960e80bbb68046aa35c7b9e7
+        uses: docker/setup-buildx-action@v4
 
       # Login against a Docker registry
       # https://github.com/docker/login-action
       - name: Log into registry ghcr.io
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
+        uses: docker/login-action@v4
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -161,7 +177,7 @@ jobs:
       # https://github.com/docker/metadata-action
       - name: Extract Docker metadata
         id: meta
-        uses: docker/metadata-action@507c2f2dc502c992ad446e3d7a5dfbe311567a96
+        uses: docker/metadata-action@v6
         with:
           images: |
             ghcr.io/${{ github.repository_owner }}/warewulf-${{ matrix.os }}
@@ -173,7 +189,7 @@ jobs:
       # https://github.com/docker/build-push-action
       - name: Build and push image
         id: build-and-push
-        uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
+        uses: docker/build-push-action@v7
         with:
           context: ${{ matrix.context }}
           file: ${{ matrix.file }}

debian/Containerfile → debian/Containerfile-12

@@ -1,17 +1,15 @@
-FROM debian
-
+FROM debian:12
 
 # ----- install vital packages -----
-ENV DEBIAN_FRONTEND teletype
+ENV DEBIAN_FRONTEND=teletype
 RUN apt-get update && apt-get install -y --no-install-recommends \
+    ca-certificates \
 	kmod \
 	systemd-sysv \
 	dbus \
 	openssh-client \
 	openssh-server \
-	isc-dhcp-client \
 	pciutils \
-	strace \
 	nfs-common \
 	ethtool\
 	ifupdown \
@@ -20,7 +18,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 	netbase && \
 	rm -rf /var/lib/apt/lists/*
 
-
 COPY excludes /etc/warewulf/
 COPY image_exit.sh /etc/warewulf/
 RUN ln -sf image_exit.sh /etc/warewulf/container_exit.sh && /etc/warewulf/image_exit.sh

debian/Containerfile-12.0 → debian/Containerfile-13

@@ -1,17 +1,15 @@
-FROM debian:12.0
-
+FROM debian:13
 
 # ----- install vital packages -----
-ENV DEBIAN_FRONTEND teletype
+ENV DEBIAN_FRONTEND=teletype
 RUN apt-get update && apt-get install -y --no-install-recommends \
+    ca-certificates \
 	kmod \
 	systemd-sysv \
 	dbus \
 	openssh-client \
 	openssh-server \
-	isc-dhcp-client \
 	pciutils \
-	strace \
 	nfs-common \
 	ethtool\
 	ifupdown \
@@ -20,7 +18,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 	netbase && \
 	rm -rf /var/lib/apt/lists/*
 
-
 COPY excludes /etc/warewulf/
 COPY image_exit.sh /etc/warewulf/
 RUN ln -sf image_exit.sh /etc/warewulf/container_exit.sh && /etc/warewulf/image_exit.sh

examples/rhel-9/Containerfile

@@ -30,7 +30,6 @@ RUN dnf install -y --allowerasing \
       selinux-policy-targeted \
       wget \
       which \
-      words \
       rdma-core \
     && dnf clean all \
     && dnf versionlock -y \

leap/Containerfile.15 → leap/Containerfile-15

@@ -40,7 +40,6 @@ RUN zypper update -y \
         wget \
         which \
         wicked \
-        words \
         zypper \
     && zypper clean \
     && systemctl enable sshd 

leap/Containerfile → leap/Containerfile-16.0

@@ -1,4 +1,4 @@
-FROM docker.io/opensuse/leap:latest
+FROM opensuse/leap:16.0
 RUN zypper update -y \
     && zypper install -yt pattern \
         base \
@@ -14,13 +14,12 @@ RUN zypper update -y \
         gawk \
         grep \
         gzip \
-        ifplugd \
         ipmitool \
         iproute2 \
         iputils \
         kernel-default \
         less \
-        net-tools \
+        NetworkManager \
         nfs-client \
         openssh-clients \
         openssh-server \
@@ -32,18 +31,19 @@ RUN zypper update -y \
         sed \
         strace \
         sudo \
+        systemd \
         tar \
         tcpdump \
         timezone \
+        udev \
         util-linux \
-        vim \
         wget \
         which \
-        wicked \
-        words \
         zypper \
     && zypper clean \
-    && systemctl enable sshd 
+    && systemd-hwdb update \
+    && systemctl enable sshd \
+    && systemctl enable NetworkManager
 
 COPY excludes /etc/warewulf/
 COPY image_exit.sh /etc/warewulf/

openeuler-24.03/Containerfile

@@ -1,4 +1,4 @@
-FROM docker.io/openeuler/openeuler:24.03-lts-sp2
+FROM docker.io/openeuler/openeuler:24.03-lts-sp3
 
 RUN dnf install -y --allowerasing \
       kernel \
@@ -29,7 +29,6 @@ RUN dnf install -y --allowerasing \
       selinux-policy-targeted \
       wget \
       which \
-      words \
       rdma-core \
     && dnf remove -y selinux-policy \
     && dnf clean all

rockylinux-8/fixed

@@ -31,7 +31,6 @@ RUN dnf update -y \
       strace \
       wget \
       which \
-      words \
     && dnf clean all
 
 RUN systemctl unmask \

tumbleweed/Containerfile

@@ -19,7 +19,7 @@ RUN zypper update -y \
         iputils \
         kernel-default \
         less \
-        net-tools \
+        NetworkManager \
         nfs-client \
         openssh-clients \
         openssh-server \
@@ -31,18 +31,19 @@ RUN zypper update -y \
         sed \
         strace \
         sudo \
+        systemd \
         tar \
         tcpdump \
         timezone \
+        udev \
         util-linux \
-        vim \
         wget \
         which \
-        wicked \
-        words \
         zypper \
     && zypper clean \
-    && systemctl enable sshd 
+    && systemd-hwdb update \
+    && systemctl enable sshd \
+    && systemctl enable NetworkManager
 
 COPY excludes /etc/warewulf/
 COPY image_exit.sh /etc/warewulf/

ubuntu/Containerfile-24.04

@@ -0,0 +1,39 @@
+FROM ubuntu:24.04
+
+ENV DEBIAN_FRONTEND=teletype
+RUN apt-get update && apt-get install -y --no-install-recommends \
+        ca-certificates \
+        apt-utils \
+        kmod \
+        init \
+        udev \
+        systemd-sysv \
+        dbus \
+        openssh-client \
+        openssh-server \
+        nfs-common \
+        linux-image-generic \
+        ifupdown \
+        netbase \
+        netplan.io \
+        libnetplan1 \
+        python3-netplan \
+        networkd-dispatcher \
+        ethtool\
+        ifmetric \
+        pciutils \
+        pci.ids \
+        mawk \
+    && apt-get autoremove -y \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY excludes /etc/warewulf/
+COPY image_exit.sh /etc/warewulf/
+RUN ln -sf image_exit.sh /etc/warewulf/container_exit.sh && /etc/warewulf/image_exit.sh
+
+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" ]

ubuntu/Containerfile-26.04

@@ -0,0 +1,39 @@
+FROM ubuntu:26.04
+
+ENV DEBIAN_FRONTEND=teletype
+RUN apt-get update && apt-get install -y --no-install-recommends \
+        ca-certificates \
+        apt-utils \
+        kmod \
+        init \
+        udev \
+        systemd-sysv \
+        dbus \
+        openssh-client \
+        openssh-server \
+        nfs-common \
+        linux-image-generic \
+        ifupdown \
+        netbase \
+        netplan.io \
+        libnetplan1 \
+        python3-netplan \
+        networkd-dispatcher \
+        ethtool\
+        ifmetric \
+        pciutils \
+        pci.ids \
+        mawk \
+    && apt-get autoremove -y \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY excludes /etc/warewulf/
+COPY image_exit.sh /etc/warewulf/
+RUN ln -sf image_exit.sh /etc/warewulf/container_exit.sh && /etc/warewulf/image_exit.sh
+
+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" ]

ubuntu/excludes

@@ -0,0 +1 @@
+/boot/

ubuntu/image_exit.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+set -x
+LANG=C
+LC_CTYPE=C
+export LANG LC_CTYPE
+apt-get clean
+rm -f /var/lib/dbus/machine-id
+truncate -s0 /etc/machine-id