From 3348737689261572ee6a8a53849b0e486067b58c Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Fri, 7 Jun 2024 23:47:07 -0600 Subject: [PATCH 1/4] Update Rocky Linux point releases Signed-off-by: Jonathon Anderson --- .github/workflows/container-publish.yml | 8 ++++++++ rockylinux-8/Makefile | 5 +++-- rockylinux-9/Makefile | 5 +++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/container-publish.yml b/.github/workflows/container-publish.yml index 9d2f7c3..7bf21bb 100644 --- a/.github/workflows/container-publish.yml +++ b/.github/workflows/container-publish.yml @@ -47,6 +47,10 @@ jobs: version: 8.9 context: rockylinux-8 file: rockylinux-8/Containerfile-8.9 + - os: rockylinux + version: 8.10 + context: rockylinux-8 + file: rockylinux-8/Containerfile-8.10 - os: rockylinux version: 9 context: rockylinux-9 @@ -67,6 +71,10 @@ jobs: version: 9.3 context: rockylinux-9 file: rockylinux-9/Containerfile-9.3 + - os: rockylinux + version: 9.4 + context: rockylinux-9 + file: rockylinux-9/Containerfile-9.4 - os: leap version: 15 context: leap diff --git a/rockylinux-8/Makefile b/rockylinux-8/Makefile index fceaaec..389dbfc 100644 --- a/rockylinux-8/Makefile +++ b/rockylinux-8/Makefile @@ -3,6 +3,7 @@ all: Containerfile-8.6 all: Containerfile-8.7 all: Containerfile-8.8 all: Containerfile-8.9 +all: Containerfile-8.10 .PHONY: clean clean: @@ -11,5 +12,5 @@ clean: Containerfile-8.%: Containerfile-vault env releasever=8.$* envsubst $@ -Containerfile-8.9: Containerfile-fixed - env releasever=8.9 envsubst $@ +Containerfile-8.10: Containerfile-fixed + env releasever=8.10 envsubst $@ diff --git a/rockylinux-9/Makefile b/rockylinux-9/Makefile index 31ba477..ef016b3 100644 --- a/rockylinux-9/Makefile +++ b/rockylinux-9/Makefile @@ -3,6 +3,7 @@ all: Containerfile-9.0 all: Containerfile-9.1 all: Containerfile-9.2 all: Containerfile-9.3 +all: Containerfile-9.4 .PHONY: clean clean: @@ -11,5 +12,5 @@ clean: Containerfile-9.%: Containerfile-vault env release=9.$* envsubst '$$release' $@ -Containerfile-9.3: Containerfile-fixed - env release=9.3 envsubst '$$release' $@ +Containerfile-9.4: Containerfile-fixed + env release=9.4 envsubst '$$release' $@ From c7eff8d63baf2d8318c890d99a021e0066e557a3 Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Mon, 26 Aug 2024 17:50:02 +0000 Subject: [PATCH 2/4] Change Rocky Linux node image bases Switch from docker.io/library/rockylinux to docker.io/rockylinux/rockylinux. Signed-off-by: Jonathon Anderson --- rockylinux-8/Containerfile | 2 +- rockylinux-8/Containerfile-fixed | 2 +- rockylinux-8/Containerfile-vault | 2 +- rockylinux-9/Containerfile | 2 +- rockylinux-9/Containerfile-fixed | 2 +- rockylinux-9/Containerfile-vault | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rockylinux-8/Containerfile b/rockylinux-8/Containerfile index d5b818d..1df33d3 100644 --- a/rockylinux-8/Containerfile +++ b/rockylinux-8/Containerfile @@ -1,4 +1,4 @@ -FROM docker.io/library/rockylinux:8 +FROM docker.io/rockylinux/rockylinux:8 RUN dnf update -y \ && dnf install -y --allowerasing \ diff --git a/rockylinux-8/Containerfile-fixed b/rockylinux-8/Containerfile-fixed index 86469e5..5a5441d 100644 --- a/rockylinux-8/Containerfile-fixed +++ b/rockylinux-8/Containerfile-fixed @@ -1,4 +1,4 @@ -FROM docker.io/library/rockylinux:${releasever} +FROM docker.io/rockylinux/rockylinux:${releasever} RUN echo "${releasever}" >/etc/dnf/vars/releasever \ && dnf clean all diff --git a/rockylinux-8/Containerfile-vault b/rockylinux-8/Containerfile-vault index a0b8f38..1e0c1e1 100644 --- a/rockylinux-8/Containerfile-vault +++ b/rockylinux-8/Containerfile-vault @@ -1,4 +1,4 @@ -FROM docker.io/library/rockylinux:${releasever} +FROM docker.io/rockylinux/rockylinux:${releasever} RUN sed -i /etc/yum.repos.d/Rocky*.repo \ -e 's/^#baseurl=/baseurl=/' \ diff --git a/rockylinux-9/Containerfile b/rockylinux-9/Containerfile index 34d98a2..d59e478 100644 --- a/rockylinux-9/Containerfile +++ b/rockylinux-9/Containerfile @@ -1,4 +1,4 @@ -FROM docker.io/library/rockylinux:9 +FROM docker.io/rockylinux/rockylinux:9 RUN dnf update -y \ && dnf install -y --allowerasing \ diff --git a/rockylinux-9/Containerfile-fixed b/rockylinux-9/Containerfile-fixed index 973f8f9..e296cab 100644 --- a/rockylinux-9/Containerfile-fixed +++ b/rockylinux-9/Containerfile-fixed @@ -1,4 +1,4 @@ -FROM docker.io/library/rockylinux:${release} +FROM docker.io/rockylinux/rockylinux:${release} RUN sed -i /etc/yum.repos.d/rocky*.repo \ -e 's/^#baseurl=/baseurl=/' \ diff --git a/rockylinux-9/Containerfile-vault b/rockylinux-9/Containerfile-vault index 1c6c419..64c0ece 100644 --- a/rockylinux-9/Containerfile-vault +++ b/rockylinux-9/Containerfile-vault @@ -1,4 +1,4 @@ -FROM docker.io/library/rockylinux:${release} +FROM docker.io/rockylinux/rockylinux:${release} RUN sed -i /etc/yum.repos.d/rocky*.repo \ -e 's/^#baseurl=/baseurl=/' \ From 53f8a5a7c96f230fe2f3e86923cf385739e259f9 Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Mon, 26 Aug 2024 19:20:47 +0000 Subject: [PATCH 3/4] Stop building CentOS 7 container The CentOS 7 container build broke, but it's EOL, so just removing it. Signed-off-by: Jonathon Anderson --- .github/workflows/container-publish.yml | 4 --- centos-7/Containerfile | 42 ------------------------- centos-7/container_exit.sh | 6 ---- centos-7/excludes | 2 -- 4 files changed, 54 deletions(-) delete mode 100644 centos-7/Containerfile delete mode 100755 centos-7/container_exit.sh delete mode 100644 centos-7/excludes diff --git a/.github/workflows/container-publish.yml b/.github/workflows/container-publish.yml index 7bf21bb..956a6cf 100644 --- a/.github/workflows/container-publish.yml +++ b/.github/workflows/container-publish.yml @@ -23,10 +23,6 @@ jobs: fail-fast: false matrix: include: - - os: centos - version: 7 - context: centos-7 - file: centos-7/Containerfile - os: rockylinux version: 8 context: rockylinux-8 diff --git a/centos-7/Containerfile b/centos-7/Containerfile deleted file mode 100644 index 7483a8f..0000000 --- a/centos-7/Containerfile +++ /dev/null @@ -1,42 +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/ -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/centos-7/container_exit.sh b/centos-7/container_exit.sh deleted file mode 100755 index 22bdbf5..0000000 --- a/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/centos-7/excludes b/centos-7/excludes deleted file mode 100644 index bf00703..0000000 --- a/centos-7/excludes +++ /dev/null @@ -1,2 +0,0 @@ -/boot/ -/usr/share/GeoIP From fef6c660984e1a5ae109059efd69030e52c4c3c7 Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Mon, 26 Aug 2024 19:22:20 +0000 Subject: [PATCH 4/4] Remove Rocky Linux 8.6 docker.io/rockylinux/rockylinux isn't building 8.6 properly, seemingly because it doesn't have aarch64 built upstream. Signed-off-by: Jonathon Anderson --- .github/workflows/container-publish.yml | 4 ---- rockylinux-8/Makefile | 1 - 2 files changed, 5 deletions(-) diff --git a/.github/workflows/container-publish.yml b/.github/workflows/container-publish.yml index 956a6cf..ab7b9b6 100644 --- a/.github/workflows/container-publish.yml +++ b/.github/workflows/container-publish.yml @@ -27,10 +27,6 @@ jobs: version: 8 context: rockylinux-8 file: rockylinux-8/Containerfile - - os: rockylinux - version: 8.6 - context: rockylinux-8 - file: rockylinux-8/Containerfile-8.6 - os: rockylinux version: 8.7 context: rockylinux-8 diff --git a/rockylinux-8/Makefile b/rockylinux-8/Makefile index 389dbfc..101bc6b 100644 --- a/rockylinux-8/Makefile +++ b/rockylinux-8/Makefile @@ -1,5 +1,4 @@ .PHONY: all -all: Containerfile-8.6 all: Containerfile-8.7 all: Containerfile-8.8 all: Containerfile-8.9