Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Rocky Linux and CentOS #53

Merged
merged 4 commits into from
Sep 20, 2024
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
16 changes: 8 additions & 8 deletions .github/workflows/container-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,10 @@ jobs:
fail-fast: false
matrix:
include:
- os: centos
version: 7
context: centos-7
file: centos-7/Containerfile
- os: rockylinux
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
Expand All @@ -47,6 +39,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
Expand All @@ -67,6 +63,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
Expand Down
42 changes: 0 additions & 42 deletions centos-7/Containerfile

This file was deleted.

6 changes: 0 additions & 6 deletions centos-7/container_exit.sh

This file was deleted.

2 changes: 0 additions & 2 deletions centos-7/excludes

This file was deleted.

2 changes: 1 addition & 1 deletion rockylinux-8/Containerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/library/rockylinux:8
FROM docker.io/rockylinux/rockylinux:8

RUN dnf update -y \
&& dnf install -y --allowerasing \
Expand Down
2 changes: 1 addition & 1 deletion rockylinux-8/Containerfile-fixed
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion rockylinux-8/Containerfile-vault
Original file line number Diff line number Diff line change
@@ -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=/' \
Expand Down
6 changes: 3 additions & 3 deletions rockylinux-8/Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
.PHONY: all
all: Containerfile-8.6
all: Containerfile-8.7
all: Containerfile-8.8
all: Containerfile-8.9
all: Containerfile-8.10

.PHONY: clean
clean:
Expand All @@ -11,5 +11,5 @@ clean:
Containerfile-8.%: Containerfile-vault
env releasever=8.$* envsubst <Containerfile-vault >$@

Containerfile-8.9: Containerfile-fixed
env releasever=8.9 envsubst <Containerfile-fixed >$@
Containerfile-8.10: Containerfile-fixed
env releasever=8.10 envsubst <Containerfile-fixed >$@
2 changes: 1 addition & 1 deletion rockylinux-9/Containerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/library/rockylinux:9
FROM docker.io/rockylinux/rockylinux:9

RUN dnf update -y \
&& dnf install -y --allowerasing \
Expand Down
2 changes: 1 addition & 1 deletion rockylinux-9/Containerfile-fixed
Original file line number Diff line number Diff line change
@@ -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=/' \
Expand Down
2 changes: 1 addition & 1 deletion rockylinux-9/Containerfile-vault
Original file line number Diff line number Diff line change
@@ -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=/' \
Expand Down
5 changes: 3 additions & 2 deletions rockylinux-9/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -11,5 +12,5 @@ clean:
Containerfile-9.%: Containerfile-vault
env release=9.$* envsubst '$$release' <Containerfile-vault >$@

Containerfile-9.3: Containerfile-fixed
env release=9.3 envsubst '$$release' <Containerfile-fixed >$@
Containerfile-9.4: Containerfile-fixed
env release=9.4 envsubst '$$release' <Containerfile-fixed >$@
Loading