Skip to content

Commit 9af3128

Browse files
anderbubbleanderbubble
authored
Merge pull request #80 from middelkoopt/tm-rocky-10
Add RockyLinux and Alma Linux 10 support
2 parents 04373a3 + 915c124 commit 9af3128

File tree

18 files changed

+416
-1
lines changed

18 files changed

+416
-1
lines changed

‎.github/workflows/container-publish.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,14 @@ jobs:
4747
version: "9.6"
4848
context: rockylinux-9
4949
file: rockylinux-9/Containerfile-9.6
50+
- os: rockylinux
51+
version: "10"
52+
context: rockylinux-10
53+
file: rockylinux-10/Containerfile
54+
- os: rockylinux
55+
version: "10.0"
56+
context: rockylinux-10
57+
file: rockylinux-10/Containerfile-10.0
5058
- os: almalinux
5159
version: "8"
5260
context: almalinux-8
@@ -71,6 +79,14 @@ jobs:
7179
version: "9.6"
7280
context: almalinux-9
7381
file: almalinux-9/Containerfile-9.6
82+
- os: almalinux
83+
version: "10"
84+
context: almalinux-10
85+
file: almalinux-10/Containerfile
86+
- os: almalinux
87+
version: "10.0"
88+
context: almalinux-10
89+
file: almalinux-10/Containerfile-10.0
7490
- os: leap
7591
version: "15"
7692
context: leap
@@ -104,8 +120,10 @@ jobs:
104120
run: |
105121
make -C rockylinux-8
106122
make -C rockylinux-9
123+
make -C rockylinux-10
107124
make -C almalinux-8
108125
make -C almalinux-9
126+
make -C almalinux-10
109127
110128
# Install the cosign tool
111129
# https://github.com/sigstore/cosign-installer

‎almalinux-10/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Containerfile-10.*

‎almalinux-10/Containerfile‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
FROM docker.io/library/almalinux:10
2+
3+
RUN dnf update -y \
4+
&& dnf install -y --allowerasing \
5+
coreutils \
6+
cpio \
7+
e2fsprogs \
8+
ethtool \
9+
findutils \
10+
initscripts \
11+
ipmitool \
12+
iproute \
13+
kernel-core \
14+
kernel-modules \
15+
net-tools \
16+
NetworkManager \
17+
nfs-utils \
18+
openssh-clients \
19+
openssh-server \
20+
pciutils \
21+
psmisc \
22+
rsync \
23+
rsyslog \
24+
strace \
25+
wget \
26+
which \
27+
words \
28+
&& dnf remove -y selinux-policy \
29+
&& dnf clean all
30+
31+
RUN chmod u+w / # https://github.com/openhpc/ohpc/issues/2061
32+
# remove unused dynamic system user
33+
RUN userdel systemd-oom && \
34+
userdel systemd-coredump
35+
36+
COPY excludes /etc/warewulf/
37+
COPY container_exit.sh /etc/warewulf/
38+
RUN /etc/warewulf/container_exit.sh
39+
40+
CMD [ "/bin/echo", "-e", \
41+
"This image is intended to be used with the Warewulf cluster management and", \
42+
"\nprovisioning system.", \
43+
"\n", \
44+
"\nFor more information about Warewulf, visit https://warewulf.org" ]

‎almalinux-10/Containerfile-fixed‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
FROM docker.io/library/almalinux:${release}
2+
3+
RUN sed -i /etc/yum.repos.d/almalinux*.repo \
4+
-e 's/^# baseurl=/baseurl=/' \
5+
-e 's/^mirrorlist=/# mirrorlist=/' \
6+
-e 's/\$releasever/${release}/' \
7+
&& dnf clean all
8+
9+
RUN dnf update -y \
10+
&& dnf install -y --allowerasing \
11+
coreutils \
12+
cpio \
13+
e2fsprogs \
14+
ethtool \
15+
findutils \
16+
initscripts \
17+
ipmitool \
18+
iproute \
19+
kernel-core \
20+
kernel-modules \
21+
net-tools \
22+
NetworkManager \
23+
nfs-utils \
24+
openssh-clients \
25+
openssh-server \
26+
pciutils \
27+
psmisc \
28+
rsync \
29+
rsyslog \
30+
strace \
31+
wget \
32+
which \
33+
words \
34+
&& dnf remove -y selinux-policy \
35+
&& dnf clean all
36+
37+
RUN chmod u+w / # https://github.com/openhpc/ohpc/issues/2061
38+
# remove unused dynamic system user
39+
RUN userdel systemd-oom && \
40+
userdel systemd-coredump
41+
42+
COPY excludes /etc/warewulf/
43+
COPY container_exit.sh /etc/warewulf/
44+
RUN /etc/warewulf/container_exit.sh
45+
46+
CMD [ "/bin/echo", "-e", \
47+
"This image is intended to be used with the Warewulf cluster management and", \
48+
"\nprovisioning system.", \
49+
"\n", \
50+
"\nFor more information about Warewulf, visit https://warewulf.org" ]

‎almalinux-10/Containerfile-vault‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
FROM docker.io/library/almalinux:${release}
2+
3+
RUN sed -i /etc/yum.repos.d/almalinux*.repo \
4+
-e 's/^# baseurl=/baseurl=/' \
5+
-e 's/^mirrorlist=/# mirrorlist=/' \
6+
-e 's/\$releasever/${release}/' \
7+
-e 's|/almalinux/|/vault/|' \
8+
&& dnf clean all
9+
10+
RUN dnf update -y \
11+
&& dnf install -y --allowerasing \
12+
coreutils \
13+
cpio \
14+
e2fsprogs \
15+
ethtool \
16+
findutils \
17+
initscripts \
18+
ipmitool \
19+
iproute \
20+
kernel-core \
21+
kernel-modules \
22+
net-tools \
23+
NetworkManager \
24+
nfs-utils \
25+
openssh-clients \
26+
openssh-server \
27+
pciutils \
28+
psmisc \
29+
rsync \
30+
rsyslog \
31+
strace \
32+
wget \
33+
which \
34+
words \
35+
&& dnf remove -y selinux-policy \
36+
&& dnf clean all
37+
38+
RUN chmod u+w / # https://github.com/openhpc/ohpc/issues/2061
39+
# remove unused dynamic system user
40+
RUN userdel systemd-oom && \
41+
userdel systemd-coredump
42+
43+
COPY excludes /etc/warewulf/
44+
COPY container_exit.sh /etc/warewulf/
45+
RUN /etc/warewulf/container_exit.sh
46+
47+
CMD [ "/bin/echo", "-e", \
48+
"This image is intended to be used with the Warewulf cluster management and", \
49+
"\nprovisioning system.", \
50+
"\n", \
51+
"\nFor more information about Warewulf, visit https://warewulf.org" ]

‎almalinux-10/Makefile‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
.PHONY: all
2+
all: Containerfile-10.0
3+
4+
.PHONY: clean
5+
clean:
6+
rm -f Containerfile-10.*
7+
8+
Containerfile-10.%: Containerfile-vault
9+
env release=10.$* envsubst '$$release' <Containerfile-vault >$@
10+
11+
Containerfile-10.0: Containerfile-fixed
12+
env release=10.0 envsubst '$$release' <Containerfile-fixed >$@

‎almalinux-10/README.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# AlmaLinux 10
2+
3+
A Warewulf container definition based on AlmaLinux 10.
4+
5+
```
6+
wwctl container import docker://ghcr.io/warewulf/warewulf-almalinux:10 almalinux-10
7+
```
8+
9+
Also available are definitions for individual point releases (e.g., AlmaLinux
10+
10.0). To generate these Containerfiles, run `make`.
11+
12+
The AlmaLinux community provides updates for the current point release of
13+
AlmaLinux 10. If you need to remain on a specific point release you may want
14+
to engage with a commercial support provider for long-term support.
15+
16+
**Note:** These container images are configured to minimize size. If you desire for
17+
man-pages and other documentation to be available to users, e.g. on login-nodes,
18+
the `/etc/yum.conf` and `/etc/dnf/dnf.conf` flag `tsflags=nodocs` needs
19+
to be removed before installing additional packages.
20+
21+
https://almalinux.org/support

‎almalinux-10/container_exit.sh‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/bin/sh
2+
3+
echo "
4+
The AlmaLinux community provides updates for the latest point release of
5+
AlmaLinux 10. If you need to remain on a specific point release (e.g.,
6+
AlmaLinux 10.0) you may want to engage with a commercial support provider for
7+
long-term support.
8+
9+
https://almalinux.org/support
10+
"
11+
12+
export LANG=C LC_CTYPE=C
13+
14+
set -x
15+
dnf clean all
16+
rm -f /etc/machine-id /var/lib/dbus/machine-id

‎almalinux-10/excludes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/boot/

‎almalinux-9/README.md‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Alma Linux 9
1+
# AlmaLinux 9
22

33
A Warewulf container definition based on AlmaLinux 9.
44

@@ -13,4 +13,9 @@ The AlmaLinux community provides updates for the current point release of
1313
AlmaLinux 9. If you need to remain on a specific point release you may want
1414
to engage with a commercial support provider for long-term support.
1515

16+
**Note:** These container images are configured to minimize size. If you desire for
17+
man-pages and other documentation to be available to users, e.g. on login-nodes,
18+
the `/etc/yum.conf` and `/etc/dnf/dnf.conf` flag `tsflags=nodocs` needs
19+
to be removed before installing additional packages.
20+
1621
https://almalinux.org/support

0 commit comments

Comments
 (0)