Skip to content

Commit

Permalink
Merge pull request #1898 from SUSE/no_maintainers
Browse files Browse the repository at this point in the history
Overwrite the incorrect author from the base container in appcol
  • Loading branch information
dcermak authored Oct 28, 2024
2 parents 2c2049e + 055e70e commit 30aecbc
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/bci_build/package/__init__.py
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
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
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

0 comments on commit 30aecbc

Please sign in to comment.