Skip to content

Commit 76c95dd

Browse files
phracekphracek
authored
Support rhel11 c11s (#158)
* Copy previous major to new version Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com> * Add distgen generated files for c11s and rhel11. c11s uses registry centos:stream10 instead of centos:stream11 because it does not exist yet Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com> * Bump version to 2.3 Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com> * Add tests for minimal-dockerfile. rhel-11 was added to tests/minimal-dockerfile/distros and test.exp Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com> --------- Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>
1 parent eebf1e9 commit 76c95dd

6 files changed

Lines changed: 40 additions & 1 deletion

File tree

‎NEWS‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
22

3+
New in 2.3:
4+
5+
* Added support for RHEL 11
6+
* Added support for CentOS Stream 11
7+
8+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
9+
310
New in 2.2:
411

512
* Fedora 43 configs added.

‎distgen/distconf/centos-stream-11-x86_64.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
extends: "lib/centos-stream.yaml"
2+
3+
os:
4+
name: CentOS Stream
5+
version: 11
6+
arch: x86_64
7+
8+
macros:
9+
libdir: $prefix/lib64
10+
# systemd stuff
11+
unitdir: /usr/lib/systemd/system
12+
userunitdir: /usr/lib/systemd/user
13+
14+
docker:
15+
registry: quay.io/centos
16+
from: centos:stream10

‎distgen/distconf/rhel-11-x86_64.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
extends: "rhel-7-x86_64.yaml"
2+
3+
os:
4+
version: 11
5+
6+
docker:
7+
from: rhel11

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
66

77
[project]
88
name = "distgen"
9-
version = "2.2"
9+
version = "2.3"
1010
dependencies = [
1111
"distro",
1212
"jinja2",

‎tests/minimal-dockerfile/distros‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ rhel-7-x86_64
44
rhel-8-x86_64
55
rhel-9-x86_64
66
rhel-10-x86_64
7+
rhel-11-x86_64

‎tests/minimal-dockerfile/test.exp‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,11 @@ ENV container="docker"
5656

5757
CMD ["container-start"]
5858

59+
=== rhel-11-x86_64 ===
60+
61+
FROM registry.access.redhat.com/rhel11
62+
MAINTAINER unknown <unknown@unknown.com>
63+
64+
ENV container="docker"
65+
66+
CMD ["container-start"]

0 commit comments

Comments
 (0)