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

List contact details in org.opencontainers.image.authors #1901

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −13
Open

List contact details in org.opencontainers.image.authors #1901

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
8 changes: 2 additions & 6 deletions src/bci_build/package/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,12 +334,6 @@ def __post_init__(self) -> None:
BuildType.KIWI if self.os_version == OsVersion.SP3 else BuildType.DOCKER
)

if not self.maintainer:
self.maintainer = (
"openSUSE (https://www.opensuse.org/)"
if self.os_version.is_tumbleweed
else "SUSE LLC (https://www.suse.com/)"
)
if not self._publish_registry:
self._publish_registry = publish_registry(self.os_version)

Expand All @@ -350,6 +344,8 @@ def __post_init__(self) -> None:
self.exclusive_arch = [Arch.AARCH64, Arch.X86_64]
# Override maintainer listing from base container by setting an empty value
self.maintainer = ""
elif not self.maintainer and not self.os_version.is_tumbleweed:
self.maintainer = "https://github.com/SUSE/bci/discussions"

# limit to tech preview for beta releases
if (
Expand Down
13 changes: 6 additions & 7 deletions tests/test_build_recipe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

# Define labels according to https://en.opensuse.org/Building_derived_containers
# labelprefix=com.suse.bci.test
LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
LABEL org.opencontainers.image.authors="https://github.com/SUSE/bci/discussions"
LABEL org.opencontainers.image.title="SLE BCI Test"
LABEL org.opencontainers.image.description="Test container based on the SLE Base Container Image."
LABEL org.opencontainers.image.version="27"
Expand Down Expand Up @@ -85,7 +85,7 @@
additionaltags="27">
<labels>
<suse_label_helper:add_prefix prefix="com.suse.bci.test">
<label name="org.opencontainers.image.authors" value="SUSE LLC (https://www.suse.com/)"/>
<label name="org.opencontainers.image.authors" value="https://github.com/SUSE/bci/discussions"/>
<label name="org.opencontainers.image.title" value="SLE BCI Test"/>
<label name="org.opencontainers.image.description" value="Test container based on the SLE Base Container Image."/>
<label name="org.opencontainers.image.version" value="27"/>
Expand Down Expand Up @@ -157,7 +157,7 @@

# Define labels according to https://en.opensuse.org/Building_derived_containers
# labelprefix=com.suse.bci.test
LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
LABEL org.opencontainers.image.authors="https://github.com/SUSE/bci/discussions"
LABEL org.opencontainers.image.title="SLE BCI Test"
LABEL org.opencontainers.image.description="Test container based on the SLE Base Container Image."
LABEL org.opencontainers.image.version="%%emacs_ver%%"
Expand Down Expand Up @@ -197,7 +197,7 @@
additionaltags="stable,%%emacs_ver%%-1.%RELEASE%,%%emacs_ver%%">
<labels>
<suse_label_helper:add_prefix prefix="com.suse.bci.test">
<label name="org.opencontainers.image.authors" value="SUSE LLC (https://www.suse.com/)"/>
<label name="org.opencontainers.image.authors" value="https://github.com/SUSE/bci/discussions"/>
<label name="org.opencontainers.image.title" value="SLE BCI Test"/>
<label name="org.opencontainers.image.description" value="Test container based on the SLE Base Container Image."/>
<label name="org.opencontainers.image.version" value="%%emacs_ver%%"/>
Expand Down Expand Up @@ -261,7 +261,7 @@

# Define labels according to https://en.opensuse.org/Building_derived_containers
# labelprefix=com.suse.bci.test
LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
LABEL org.opencontainers.image.authors="https://github.com/SUSE/bci/discussions"
LABEL org.opencontainers.image.title="SLE BCI Test"
LABEL org.opencontainers.image.description="Test container based on the SLE Base Container Image."
LABEL org.opencontainers.image.version="29"
Expand Down Expand Up @@ -304,7 +304,7 @@
user="emacs">
<labels>
<suse_label_helper:add_prefix prefix="com.suse.bci.test">
<label name="org.opencontainers.image.authors" value="SUSE LLC (https://www.suse.com/)"/>
<label name="org.opencontainers.image.authors" value="https://github.com/SUSE/bci/discussions"/>
<label name="org.opencontainers.image.title" value="SLE BCI Test"/>
<label name="org.opencontainers.image.description" value="Test container based on the SLE Base Container Image."/>
<label name="org.opencontainers.image.version" value="29"/>
Expand Down Expand Up @@ -542,7 +542,6 @@ def test_build_recipe_templates(
additionaltags="%OS_VERSION_ID_SP%,latest">
<labels>
<suse_label_helper:add_prefix prefix="org.opensuse.bci.test">
<label name="org.opencontainers.image.authors" value="openSUSE (https://www.opensuse.org/)"/>
<label name="org.opencontainers.image.title" value="openSUSE Tumbleweed BCI Test"/>
<label name="org.opencontainers.image.description" value="A test environment for containers."/>
<label name="org.opencontainers.image.version" value="%OS_VERSION_ID_SP%-%RELEASE%"/>
Expand Down
Loading