Replace containers with pointer to warewulf-node-images

Signed-off-by: Jonathon Anderson <janderson@ciq.co>
2023-03-17 14:57:59 -06:00
parent 2c9a241643
commit 5ff2da7331
13 changed files with 9 additions and 194 deletions
--- a/containers/Apptainer/centos-7.def
+++ b/containers/Apptainer/centos-7.def
@@ -1,17 +0,0 @@
-BootStrap: yum
-OSVersion: 7
-MirrorURL: http://mirror.centos.org/centos-%{OSVERSION}/%{OSVERSION}/os/x86_64/
-Include: yum
-
-
-%post
-
-    sed -i 's/^root:.:/root::/g' /etc/passwd
-
-    yum install -y basesystem bash chkconfig coreutils e2fsprogs \
-    ethtool filesystem findutils gawk grep initscripts iproute \
-    iputils net-tools nfs-utils pam psmisc rdate rsync sed setup \
-    shadow-utils rsyslog tcp_wrappers tzdata util-linux words \
-    zlib tar less gzip which util-linux openssh-clients  \
-    openssh-server dhclient pciutils vim-minimal shadow-utils \
-    strace cronie crontabs cpio wget centos-release ipmitool
--- a/containers/Apptainer/leap-15.def
+++ b/containers/Apptainer/leap-15.def
@@ -1,19 +0,0 @@
-BootStrap: zypper
-OSVersion: 15.3
-MirrorURL: http://download.opensuse.org/distribution/leap/%{OSVERSION}/repo/oss/
-Include: zypper
-
-
-%post
-
-    sed -i 's/^root:.:/root::/g' /etc/passwd
-
-    zypper install -y patterns-openSUSE-base bash coreutils e2fsprogs \
-    ethtool filesystem findutils gawk grep \
-    ifplugd iputils iproute2 net-tools nfs-client pam psmisc rsync sed \
-    rsyslog util-linux words wicked tar less \
-    gzip which util-linux openssh-clients openssh-server \
-    pciutils vim strace sudo syslinux tcpdump timezone cronie cpio \
-    wget  ipmitool zypper
-
-    systemctl enable sshd
--- a/containers/Apptainer/rocky-8.def
+++ b/containers/Apptainer/rocky-8.def
@@ -1,54 +0,0 @@
-BootStrap: docker
-From: rockylinux:8
-
-%post
-dnf update -y ;\
-    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
-
-dnf clean all
-
-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
-
-mkdir -p /etc/warewulf
-touch /etc/warewulf/excludes
-touch /etc/warewulf/container_exit.sh
-chmod +x /etc/warewulf/container_exit.sh
-
-echo "#!/bin/sh" > /etc/warewulf/container_exit.sh
-echo "set -x" >> /etc/warewulf/container_exit.sh
-echo "LANG=C" >> /etc/warewulf/container_exit.sh
-echo "LC_CTYPE=C" >> /etc/warewulf/container_exit.sh
-echo "export LANG LC_CTYPE" >> /etc/warewulf/container_exit.sh
-echo "dnf clean all" >> /etc/warewulf/container_exit.sh
-echo "/boot/" > /etc/warewulf/excludes
-echo "/usr/share/GeoIP" >> /etc/warewulf/excludes
--- a/containers/Docker/.gitignore
+++ b/containers/Docker/.gitignore
@@ -1 +0,0 @@
-*.tar
--- a/containers/Docker/Makefile
+++ b/containers/Docker/Makefile
@@ -1,9 +0,0 @@
-all: centos-7.tar rockylinux-8.tar openhpc-2.tar
-.PHONY: all
-
-%.tar: %/Containerfile
-	podman save $$(podman build --quiet $*) >$@
-
-clean:
-	rm -rf *.tar
-.PHONY: clean
--- a/containers/Docker/centos-7/Containerfile
+++ b/containers/Docker/centos-7/Containerfile
@@ -1,36 +0,0 @@
-FROM docker.io/library/centos:7
-
-RUN yum update -y \
-    && yum install -y \
-      coreutils \
-      cpio \
-      dhclient \
-      e2fsprogs \
-      ethtool \
-      findutils \
-      initscripts \
-      ipmitool \
-      iproute \
-      kernel \
-      net-tools \
-      network-scripts \
-      nfs-utils \
-      openssh-clients \
-      openssh-server \
-      pciutils \
-      psmisc \
-      rsync \
-      rsyslog \
-      strace \
-      wget \
-      which \
-      words \
-    && yum clean all \
-    && 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
-
-COPY excludes /etc/warewulf/excludes
-COPY container_exit.sh /etc/warewulf/container_exit.sh
--- a/containers/Docker/centos-7/container_exit.sh
+++ b/containers/Docker/centos-7/container_exit.sh
@@ -1,6 +0,0 @@
-#!/bin/sh
-set -x
-LANG=C
-LC_CTYPE=C
-export LANG LC_CTYPE
-yum clean all
--- a/containers/Docker/centos-7/excludes
+++ b/containers/Docker/centos-7/excludes
@@ -1,2 +0,0 @@
-/boot/
-/usr/share/GeoIP
--- a/containers/Docker/openhpc-2/Containerfile
+++ b/containers/Docker/openhpc-2/Containerfile
@@ -1,7 +0,0 @@
-FROM docker.io/warewulf/rockylinux: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
--- a/containers/Docker/rockylinux-8/Containerfile
+++ b/containers/Docker/rockylinux-8/Containerfile
@@ -1,35 +0,0 @@
-FROM docker.io/library/rockylinux:8
-
-RUN dnf update -y \
-    && dnf install -y --allowerasing coreutils \
-      cpio \
-      dhclient \
-      e2fsprogs \
-      ethtool \
-      findutils \
-      initscripts \
-      ipmitool \
-      iproute \
-      kernel-core \
-      kernel-modules \
-      net-tools \
-      network-scripts \
-      nfs-utils \
-      openssh-clients \
-      openssh-server \
-      pciutils \
-      psmisc \
-      rsync \
-      rsyslog \
-      strace \
-      wget \
-      which \
-      words \
-    && dnf clean all
-
-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
--- a/containers/Docker/rockylinux-8/container_exit.sh
+++ b/containers/Docker/rockylinux-8/container_exit.sh
@@ -1,6 +0,0 @@
-#!/bin/sh
-set -x
-LANG=C
-LC_CTYPE=C
-export LANG LC_CTYPE
-dnf clean all
--- a/containers/Docker/rockylinux-8/excludes
+++ b/containers/Docker/rockylinux-8/excludes
@@ -1,2 +0,0 @@
-/boot/
-/usr/share/GeoIP
--- a/containers/README.md
+++ b/containers/README.md
@@ -0,0 +1,9 @@
+# Node images have moved
+
+Warewulf node images are now being maintained in a separate repository:
+
+https://github.com/hpcng/warewulf-node-images.
+
+Images are built and published to GHCR automatically:
+
+https://github.com/orgs/hpcng/packages?repo_name=warewulf-node-images