Skip to content

Commit

Permalink
Add support for generating sources for RHEL10. (#155)
Browse files Browse the repository at this point in the history
* Add support for generating sources for RHEL10.

Added distconf/rhel-10-x86_64 configuration file.
Add rhel10 to tests/minimal-dockerfile files

Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>

* Bump pyproject.toml file to 2.1

Add more spaces to 'tests/minimal-dockerfile/test.exp'

Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>

---------

Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>
  • Loading branch information
phracek authored Jan 14, 2025
1 parent 9512f35 commit 69531e6
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 1 deletion.
6 changes: 6 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

New in 2.1:

* Added support for RHEL 10

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

New in 2.0:

* Complete rewrite of buildsystem to use pyproject.toml
Expand Down
7 changes: 7 additions & 0 deletions distgen/distconf/rhel-10-x86_64.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
extends: "rhel-7-x86_64.yaml"

os:
version: 10

docker:
from: rhel10
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "distgen"
version = "2.0"
version = "2.1"
dependencies = [
"distro",
"jinja2",
Expand Down
1 change: 1 addition & 0 deletions tests/minimal-dockerfile/distros
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ fedora-22-x86_64
rhel-7-x86_64
rhel-8-x86_64
rhel-9-x86_64
rhel-10-x86_64
10 changes: 10 additions & 0 deletions tests/minimal-dockerfile/test.exp
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,13 @@ MAINTAINER unknown <unknown@unknown.com>
ENV container="docker"

CMD ["container-start"]

=== rhel-10-x86_64 ===

FROM registry.access.redhat.com/rhel10
MAINTAINER unknown <unknown@unknown.com>

ENV container="docker"

CMD ["container-start"]

0 comments on commit 69531e6

Please sign in to comment.