Skip to content

Remove 'version' label from Dockerfile.rhel10 #621

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Sep 12, 2025
Merged

Remove 'version' label from Dockerfile.rhel10 #621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7936c1a
Remove 'version' label from Dockerfile.rhel10
phracek Sep 11, 2025
cb638d5
Add distgen generated sources
phracek Sep 11, 2025
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
1 change: 0 additions & 1 deletion 16/Dockerfile.rhel10
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ LABEL summary="$SUMMARY" \
io.openshift.s2i.assemble-user="26" \
name="rhel10/postgresql-16" \
com.redhat.component="postgresql-16-container" \
version="1" \
com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#rhel" \
usage="podman run -d --name postgresql_database -e POSTGRESQL_USER=user -e POSTGRESQL_PASSWORD=pass -e POSTGRESQL_DATABASE=db -p 5432:5432 rhel10/postgresql-16" \
maintainer="SoftwareCollections.org <[email protected]>"
Expand Down
6 changes: 2 additions & 4 deletions src/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,10 @@ LABEL summary="$SUMMARY" \
io.openshift.s2i.assemble-user="26" \
name="{{ spec.img_name }}" \
com.redhat.component="{{ spec.redhat_component }}" \
{% if spec.version not in ["9.4", "9.5", "9.6"] %}
{% if config.os.id == "rhel" and spec.prod != "rhel10" %}
version="1" \
Copy link
Member

@fila43 fila43 Sep 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just out of curiosity, why are you using such a complicated construct if you set version=1 in both cases?
otherwise LGTM

Copy link
Member Author

@phracek phracek Sep 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is affected only for RHEL10. Not rhel8, rhel9.

{% elif spec.version == "9.6" and config.os.id == "rhel" %}
{% elif spec.prod in ["c9s", "c10s"] %}
version="1" \
{% else %}
version="{{ spec.version }}" \
{% endif %}
{% if config.os.id == 'rhel' %}
com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#rhel" \
Expand Down