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.

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

Jump to bottom

Overwrite the incorrect author from the base container in appcol #1898

Merged
merged 1 commit into from
Oct 28, 2024
Merged

Overwrite the incorrect author from the base container in appcol #1898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/bci_build/package/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,8 +348,8 @@ def __post_init__(self) -> None:
# Limit to aarch64 and x86_64
if not self.exclusive_arch:
self.exclusive_arch = [Arch.AARCH64, Arch.X86_64]
# Disable maintainer listing
self.maintainer = None
# Override maintainer listing from base container by setting an empty value
self.maintainer = ""

# limit to tech preview for beta releases
if (
Expand Down
2 changes: 1 addition & 1 deletion src/bci_build/templates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
COPY --from=builder /target /{% endif %}
# Define labels according to https://en.opensuse.org/Building_derived_containers
# labelprefix={{ image.labelprefix }}
{%- if image.maintainer %}
{%- if image.maintainer != None %}
LABEL org.opencontainers.image.authors="{{ image.maintainer }}"
{%- endif %}
LABEL org.opencontainers.image.title="{{ image.title }}"
Expand Down
1 change: 1 addition & 0 deletions tests/test_build_recipe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,6 +641,7 @@ def test_os_build_recipe_templates(kiwi_xml: str, image: OsContainer) -> None:
COPY --from=builder /target /
# Define labels according to https://en.opensuse.org/Building_derived_containers
# labelprefix=com.suse.application.test
LABEL org.opencontainers.image.authors=""
LABEL org.opencontainers.image.title="Test"
LABEL org.opencontainers.image.description="Test container based on the SLE Base Container Image."
LABEL org.opencontainers.image.version="%%emacs_version%%"
Expand Down