From a183e3ebe51c053a65390037f7482a44dc1880e2 Mon Sep 17 00:00:00 2001
From: Gregory Kurtzer <gmkurtzer@gmail.com>
Date: Wed, 25 May 2022 14:33:45 -0700
Subject: [PATCH] Container recipes updated

---
 containers/Docker/centos-8 | 57 --------------------------------------
 containers/Docker/openhpc  |  1 +
 containers/Docker/rocky-8  |  1 +
 3 files changed, 2 insertions(+), 57 deletions(-)
 delete mode 100644 containers/Docker/centos-8

diff --git a/containers/Docker/centos-8 b/containers/Docker/centos-8
deleted file mode 100644
index 77493213..00000000
--- a/containers/Docker/centos-8
+++ /dev/null
@@ -1,57 +0,0 @@
-FROM docker.io/library/centos:8
-
-RUN dnf install -y --allowerasing coreutils \
-    cpio \
-    dhclient \
-    e2fsprogs \
-    ethtool \
-    findutils \
-    initscripts \
-    ipmitool \
-    iproute \
-    kernel-core \
-    net-tools \
-    network-scripts \
-    nfs-utils \
-    openssh-clients \
-    openssh-server \
-    pciutils \
-    psmisc \
-    rsync \
-    rsyslog \
-    strace \
-    wget \
-    which \
-    words
-
-RUN <<EOF
-    sed -i -e '/^account.*pam_unix\.so\s*$/s/\s*$/\ broken_shadow/' /etc/pam.d/system-auth
-    sed -i -e '/^account.*pam_unix\.so\s*$/s/\s*$/\ broken_shadow/' /etc/pam.d/password-auth
-
-    systemctl unmask console-getty.service dev-hugepages.mount \
-        getty.target sys-fs-fuse-connections.mount systemd-logind.service \
-        systemd-remount-fs.service
-
-    systemctl enable network
-    touch /etc/sysconfig/disable-deprecation-warnings
-
-    mkdir -p /etc/warewulf
-    touch /etc/warewulf/excludes
-    touch /etc/warewulf/container_exit.sh
-    chmod +x /etc/warewulf/container_exit.sh
-EOF
-
-
-COPY <<EOF /etc/warewulf/container_exit.sh
-#!/bin/sh
-set -x
-LANG=C
-LC_CTYPE=C
-export LANG LC_CTYPE
-dnf clean all
-EOF
-
-COPY <<EOF /etc/warewulf/excludes
-/boot/
-/usr/share/GeoIP
-EOF
diff --git a/containers/Docker/openhpc b/containers/Docker/openhpc
index a8d0ea5d..84cd9da3 100644
--- a/containers/Docker/openhpc
+++ b/containers/Docker/openhpc
@@ -3,4 +3,5 @@ FROM docker.io/warewulf/rocky:8
 RUN dnf -y install http://repos.openhpc.community/OpenHPC/2/CentOS_8/x86_64/ohpc-release-2-1.el8.x86_64.rpm; \
     sed -i -e 's/^enabled=0/enabled=1/g' /etc/yum.repos.d/*-PowerTools.repo; \
     dnf -y install ohpc-base-compute ohpc-slurm-client chrony lmod-ohpc; \
+    dnf -y clean all ;\
     systemctl enable munge
diff --git a/containers/Docker/rocky-8 b/containers/Docker/rocky-8
index 4fa930ce..3e8b26ff 100644
--- a/containers/Docker/rocky-8
+++ b/containers/Docker/rocky-8
@@ -28,6 +28,7 @@ RUN dnf update -y ;\
 
 RUN sed -i -e '/^account.*pam_unix\.so\s*$/s/\s*$/\ broken_shadow/' /etc/pam.d/system-auth ;\
     sed -i -e '/^account.*pam_unix\.so\s*$/s/\s*$/\ broken_shadow/' /etc/pam.d/password-auth ;\
+    rm -f /etc/sysconfig/network-scripts/ifcfg-e* ;\
     systemctl unmask console-getty.service dev-hugepages.mount getty.target sys-fs-fuse-connections.mount systemd-logind.service systemd-remount-fs.service ;\
     systemctl enable network ;\
     touch /etc/sysconfig/disable-deprecation-warnings ;\