From 5ff2da7331b71857289ae2d0255fab8484880862 Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Fri, 17 Mar 2023 14:57:59 -0600 Subject: [PATCH] Replace containers with pointer to warewulf-node-images Signed-off-by: Jonathon Anderson --- containers/Apptainer/centos-7.def | 17 ------ containers/Apptainer/leap-15.def | 19 ------- containers/Apptainer/rocky-8.def | 54 ------------------- containers/Docker/.gitignore | 1 - containers/Docker/Makefile | 9 ---- containers/Docker/centos-7/Containerfile | 36 ------------- containers/Docker/centos-7/container_exit.sh | 6 --- containers/Docker/centos-7/excludes | 2 - containers/Docker/openhpc-2/Containerfile | 7 --- containers/Docker/rockylinux-8/Containerfile | 35 ------------ .../Docker/rockylinux-8/container_exit.sh | 6 --- containers/Docker/rockylinux-8/excludes | 2 - containers/README.md | 9 ++++ 13 files changed, 9 insertions(+), 194 deletions(-) delete mode 100644 containers/Apptainer/centos-7.def delete mode 100644 containers/Apptainer/leap-15.def delete mode 100644 containers/Apptainer/rocky-8.def delete mode 100644 containers/Docker/.gitignore delete mode 100644 containers/Docker/Makefile delete mode 100644 containers/Docker/centos-7/Containerfile delete mode 100755 containers/Docker/centos-7/container_exit.sh delete mode 100644 containers/Docker/centos-7/excludes delete mode 100644 containers/Docker/openhpc-2/Containerfile delete mode 100644 containers/Docker/rockylinux-8/Containerfile delete mode 100755 containers/Docker/rockylinux-8/container_exit.sh delete mode 100644 containers/Docker/rockylinux-8/excludes create mode 100644 containers/README.md diff --git a/containers/Apptainer/centos-7.def b/containers/Apptainer/centos-7.def deleted file mode 100644 index 2b2f632b..00000000 --- a/containers/Apptainer/centos-7.def +++ /dev/null @@ -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 diff --git a/containers/Apptainer/leap-15.def b/containers/Apptainer/leap-15.def deleted file mode 100644 index e712ba72..00000000 --- a/containers/Apptainer/leap-15.def +++ /dev/null @@ -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 diff --git a/containers/Apptainer/rocky-8.def b/containers/Apptainer/rocky-8.def deleted file mode 100644 index 50575309..00000000 --- a/containers/Apptainer/rocky-8.def +++ /dev/null @@ -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 \ No newline at end of file diff --git a/containers/Docker/.gitignore b/containers/Docker/.gitignore deleted file mode 100644 index d874ad67..00000000 --- a/containers/Docker/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.tar diff --git a/containers/Docker/Makefile b/containers/Docker/Makefile deleted file mode 100644 index 0343b9b2..00000000 --- a/containers/Docker/Makefile +++ /dev/null @@ -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 diff --git a/containers/Docker/centos-7/Containerfile b/containers/Docker/centos-7/Containerfile deleted file mode 100644 index 1d7f23e7..00000000 --- a/containers/Docker/centos-7/Containerfile +++ /dev/null @@ -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 diff --git a/containers/Docker/centos-7/container_exit.sh b/containers/Docker/centos-7/container_exit.sh deleted file mode 100755 index 22bdbf51..00000000 --- a/containers/Docker/centos-7/container_exit.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -set -x -LANG=C -LC_CTYPE=C -export LANG LC_CTYPE -yum clean all diff --git a/containers/Docker/centos-7/excludes b/containers/Docker/centos-7/excludes deleted file mode 100644 index bf007032..00000000 --- a/containers/Docker/centos-7/excludes +++ /dev/null @@ -1,2 +0,0 @@ -/boot/ -/usr/share/GeoIP diff --git a/containers/Docker/openhpc-2/Containerfile b/containers/Docker/openhpc-2/Containerfile deleted file mode 100644 index 1a5e36b3..00000000 --- a/containers/Docker/openhpc-2/Containerfile +++ /dev/null @@ -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 diff --git a/containers/Docker/rockylinux-8/Containerfile b/containers/Docker/rockylinux-8/Containerfile deleted file mode 100644 index 1200eb66..00000000 --- a/containers/Docker/rockylinux-8/Containerfile +++ /dev/null @@ -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 diff --git a/containers/Docker/rockylinux-8/container_exit.sh b/containers/Docker/rockylinux-8/container_exit.sh deleted file mode 100755 index 84993a5f..00000000 --- a/containers/Docker/rockylinux-8/container_exit.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -set -x -LANG=C -LC_CTYPE=C -export LANG LC_CTYPE -dnf clean all diff --git a/containers/Docker/rockylinux-8/excludes b/containers/Docker/rockylinux-8/excludes deleted file mode 100644 index bf007032..00000000 --- a/containers/Docker/rockylinux-8/excludes +++ /dev/null @@ -1,2 +0,0 @@ -/boot/ -/usr/share/GeoIP diff --git a/containers/README.md b/containers/README.md new file mode 100644 index 00000000..04c5170f --- /dev/null +++ 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