Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions .github/workflows/container-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@ jobs:
version: "9"
context: rockylinux-9
file: rockylinux-9/Containerfile
- os: rockylinux
version: "9.5"
context: rockylinux-9
file: rockylinux-9/Containerfile-9.5
- os: rockylinux
version: "9.6"
context: rockylinux-9
file: rockylinux-9/Containerfile-9.6
- os: rockylinux
version: "9.7"
context: rockylinux-9
file: rockylinux-9/Containerfile-9.7
- os: rockylinux
version: "10"
context: rockylinux-10
Expand All @@ -55,6 +55,10 @@ jobs:
version: "10.0"
context: rockylinux-10
file: rockylinux-10/Containerfile-10.0
- os: rockylinux
version: "10.1"
context: rockylinux-10
file: rockylinux-10/Containerfile-10.1
- os: almalinux
version: "8"
context: almalinux-8
Expand All @@ -71,14 +75,14 @@ jobs:
version: "9"
context: almalinux-9
file: almalinux-9/Containerfile
- os: almalinux
version: "9.5"
context: almalinux-9
file: almalinux-9/Containerfile-9.5
- os: almalinux
version: "9.6"
context: almalinux-9
file: almalinux-9/Containerfile-9.6
- os: almalinux
version: "9.7"
context: almalinux-9
file: almalinux-9/Containerfile-9.7
- os: almalinux
version: "10"
context: almalinux-10
Expand All @@ -87,6 +91,10 @@ jobs:
version: "10.0"
context: almalinux-10
file: almalinux-10/Containerfile-10.0
- os: almalinux
version: "10.1"
context: almalinux-10
file: almalinux-10/Containerfile-10.1
- os: leap
version: "15"
context: leap
Expand Down
1 change: 0 additions & 1 deletion almalinux-10/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ RUN dnf update -y \
strace \
wget \
which \
words \
&& dnf remove -y selinux-policy \
&& dnf clean all

Expand Down
1 change: 0 additions & 1 deletion almalinux-10/Containerfile-fixed
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ RUN dnf update -y \
strace \
wget \
which \
words \
&& dnf remove -y selinux-policy \
&& dnf clean all

Expand Down
1 change: 0 additions & 1 deletion almalinux-10/Containerfile-vault
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ RUN dnf update -y \
strace \
wget \
which \
words \
&& dnf remove -y selinux-policy \
&& dnf clean all

Expand Down
5 changes: 3 additions & 2 deletions almalinux-10/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.PHONY: all
all: Containerfile-10.0
all: Containerfile-10.1

.PHONY: clean
clean:
Expand All @@ -8,5 +9,5 @@ clean:
Containerfile-10.%: Containerfile-vault
env release=10.$* envsubst '$$release' <Containerfile-vault >$@

Containerfile-10.0: Containerfile-fixed
env release=10.0 envsubst '$$release' <Containerfile-fixed >$@
Containerfile-10.1: Containerfile-fixed
env release=10.1 envsubst '$$release' <Containerfile-fixed >$@
3 changes: 1 addition & 2 deletions almalinux-8/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ RUN dnf update -y \
&& dnf install -y --allowerasing \
coreutils \
cpio \
dhclient \
e2fsprogs \
ethtool \
findutils \
Expand All @@ -25,7 +24,6 @@ RUN dnf update -y \
strace \
wget \
which \
words \
&& dnf clean all

RUN systemctl unmask \
Expand All @@ -37,6 +35,7 @@ RUN systemctl unmask \
systemd-remount-fs.service

RUN chmod u+w / # https://github.com/openhpc/ohpc/issues/2061
RUN userdel systemd-coredump # remove unused dynamic system user

COPY excludes /etc/warewulf/
COPY container_exit.sh /etc/warewulf/
Expand Down
3 changes: 1 addition & 2 deletions almalinux-8/Containerfile-fixed
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ RUN dnf update -y \
&& dnf install -y --allowerasing \
coreutils \
cpio \
dhclient \
e2fsprogs \
ethtool \
findutils \
Expand All @@ -28,7 +27,6 @@ RUN dnf update -y \
strace \
wget \
which \
words \
&& dnf clean all

RUN systemctl unmask \
Expand All @@ -40,6 +38,7 @@ RUN systemctl unmask \
systemd-remount-fs.service

RUN chmod u+w / # https://github.com/openhpc/ohpc/issues/2061
RUN userdel systemd-coredump # remove unused dynamic system user

COPY excludes /etc/warewulf/
COPY container_exit.sh /etc/warewulf/
Expand Down
3 changes: 1 addition & 2 deletions almalinux-8/Containerfile-vault
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ RUN dnf update -y \
&& dnf install -y --allowerasing \
coreutils \
cpio \
dhclient \
e2fsprogs \
ethtool \
findutils \
Expand All @@ -32,7 +31,6 @@ RUN dnf update -y \
strace \
wget \
which \
words \
&& dnf clean all

RUN systemctl unmask \
Expand All @@ -44,6 +42,7 @@ RUN systemctl unmask \
systemd-remount-fs.service

RUN chmod u+w / # https://github.com/openhpc/ohpc/issues/2061
RUN userdel systemd-coredump # remove unused dynamic system user

COPY excludes /etc/warewulf/
COPY container_exit.sh /etc/warewulf/
Expand Down
3 changes: 1 addition & 2 deletions almalinux-9/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ RUN dnf update -y \
&& dnf install -y --allowerasing \
coreutils \
cpio \
dhclient \
e2fsprogs \
ethtool \
findutils \
Expand All @@ -26,7 +25,6 @@ RUN dnf update -y \
strace \
wget \
which \
words \
&& dnf remove -y selinux-policy \
&& dnf clean all

Expand All @@ -39,6 +37,7 @@ RUN systemctl unmask \
systemd-remount-fs.service

RUN chmod u+w / # https://github.com/openhpc/ohpc/issues/2061
RUN userdel systemd-coredump # remove unused dynamic system user

COPY excludes /etc/warewulf/
COPY container_exit.sh /etc/warewulf/
Expand Down
3 changes: 1 addition & 2 deletions almalinux-9/Containerfile-fixed
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ RUN dnf update -y \
&& dnf install -y --allowerasing \
coreutils \
cpio \
dhclient \
e2fsprogs \
ethtool \
findutils \
Expand All @@ -32,7 +31,6 @@ RUN dnf update -y \
strace \
wget \
which \
words \
&& dnf remove -y selinux-policy \
&& dnf clean all

Expand All @@ -45,6 +43,7 @@ RUN systemctl unmask \
systemd-remount-fs.service

RUN chmod u+w / # https://github.com/openhpc/ohpc/issues/2061
RUN userdel systemd-coredump # remove unused dynamic system user

COPY excludes /etc/warewulf/
COPY container_exit.sh /etc/warewulf/
Expand Down
4 changes: 1 addition & 3 deletions almalinux-9/Containerfile-vault
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ RUN dnf update -y \
&& dnf install -y --allowerasing \
coreutils \
cpio \
dhclient \
e2fsprogs \
ethtool \
findutils \
Expand All @@ -33,7 +32,6 @@ RUN dnf update -y \
strace \
wget \
which \
words \
&& dnf remove -y selinux-policy \
&& dnf clean all

Expand All @@ -46,7 +44,7 @@ RUN systemctl unmask \
systemd-remount-fs.service

RUN chmod u+w / # https://github.com/openhpc/ohpc/issues/2061
RUN userdel systemd-oom # remove unused dynamic system user
RUN userdel systemd-coredump # remove unused dynamic system user

COPY excludes /etc/warewulf/
COPY container_exit.sh /etc/warewulf/
Expand Down
6 changes: 3 additions & 3 deletions almalinux-9/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.PHONY: all
all: Containerfile-9.5
all: Containerfile-9.6
all: Containerfile-9.7

.PHONY: clean
clean:
Expand All @@ -9,5 +9,5 @@ clean:
Containerfile-9.%: Containerfile-vault
env release=9.$* envsubst '$$release' <Containerfile-vault >$@

Containerfile-9.6: Containerfile-fixed
env release=9.6 envsubst '$$release' <Containerfile-fixed >$@
Containerfile-9.7: Containerfile-fixed
env release=9.7 envsubst '$$release' <Containerfile-fixed >$@
1 change: 0 additions & 1 deletion examples/rhel-9/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ RUN dnf install -y --allowerasing \
python3-dnf-plugin-versionlock \
coreutils \
cpio \
dhclient \
e2fsprogs \
ethtool \
findutils \
Expand Down
1 change: 0 additions & 1 deletion openeuler-24.03/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ RUN dnf install -y --allowerasing \
python3-dnf-plugin-versionlock \
coreutils \
cpio \
dhclient \
e2fsprogs \
ethtool \
findutils \
Expand Down
1 change: 0 additions & 1 deletion rockylinux-10/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ RUN dnf update -y \
strace \
wget \
which \
words \
&& dnf remove -y selinux-policy \
&& dnf clean all

Expand Down
1 change: 0 additions & 1 deletion rockylinux-10/Containerfile-fixed
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ RUN dnf update -y \
strace \
wget \
which \
words \
&& dnf remove -y selinux-policy \
&& dnf clean all

Expand Down
1 change: 0 additions & 1 deletion rockylinux-10/Containerfile-vault
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ RUN dnf update -y \
strace \
wget \
which \
words \
&& dnf remove -y selinux-policy \
&& dnf clean all

Expand Down
5 changes: 3 additions & 2 deletions rockylinux-10/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.PHONY: all
all: Containerfile-10.0
all: Containerfile-10.1

.PHONY: clean
clean:
Expand All @@ -8,5 +9,5 @@ clean:
Containerfile-10.%: Containerfile-vault
env release=10.$* envsubst '$$release' <Containerfile-vault >$@

Containerfile-10.0: Containerfile-fixed
env release=10.0 envsubst '$$release' <Containerfile-fixed >$@
Containerfile-10.1: Containerfile-fixed
env release=10.1 envsubst '$$release' <Containerfile-fixed >$@
4 changes: 2 additions & 2 deletions rockylinux-8/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ RUN dnf update -y \
&& dnf install -y --allowerasing \
coreutils \
cpio \
dhclient \
e2fsprogs \
ethtool \
findutils \
Expand All @@ -25,7 +24,6 @@ RUN dnf update -y \
strace \
wget \
which \
words \
&& dnf clean all

RUN systemctl unmask \
Expand All @@ -37,6 +35,8 @@ RUN systemctl unmask \
systemd-remount-fs.service

RUN chmod u+w / # https://github.com/openhpc/ohpc/issues/2061
RUN userdel systemd-coredump # remove unused dynamic system user
RUN userdel unbound # remove unused dynamic system user

COPY excludes /etc/warewulf/
COPY container_exit.sh /etc/warewulf/
Expand Down
4 changes: 2 additions & 2 deletions rockylinux-8/Containerfile-fixed
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ RUN dnf update -y \
&& dnf install -y --allowerasing \
coreutils \
cpio \
dhclient \
e2fsprogs \
ethtool \
findutils \
Expand All @@ -28,7 +27,6 @@ RUN dnf update -y \
strace \
wget \
which \
words \
&& dnf clean all

RUN systemctl unmask \
Expand All @@ -40,6 +38,8 @@ RUN systemctl unmask \
systemd-remount-fs.service

RUN chmod u+w / # https://github.com/openhpc/ohpc/issues/2061
RUN userdel systemd-coredump # remove unused dynamic system user
RUN userdel unbound # remove unused dynamic system user

COPY excludes /etc/warewulf/
COPY container_exit.sh /etc/warewulf/
Expand Down
3 changes: 1 addition & 2 deletions rockylinux-8/Containerfile-vault
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ RUN dnf update -y \
&& dnf install -y --allowerasing \
coreutils \
cpio \
dhclient \
e2fsprogs \
ethtool \
findutils \
Expand All @@ -32,7 +31,6 @@ RUN dnf update -y \
strace \
wget \
which \
words \
&& dnf clean all

RUN systemctl unmask \
Expand All @@ -44,6 +42,7 @@ RUN systemctl unmask \
systemd-remount-fs.service

RUN chmod u+w / # https://github.com/openhpc/ohpc/issues/2061
RUN userdel systemd-coredump # remove unused dynamic system user

COPY excludes /etc/warewulf/
COPY container_exit.sh /etc/warewulf/
Expand Down
1 change: 0 additions & 1 deletion rockylinux-8/fixed
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ RUN dnf update -y \
&& dnf install -y --allowerasing \
coreutils \
cpio \
dhclient \
e2fsprogs \
ethtool \
findutils \
Expand Down
Loading