diff --git a/src/bci_build/package/__init__.py b/src/bci_build/package/__init__.py
index 66fd279d1..ba16feda8 100644
--- a/src/bci_build/package/__init__.py
+++ b/src/bci_build/package/__init__.py
@@ -840,6 +840,11 @@ def dockerfile_from_target_ref(self) -> str:
else f"{self.base_image_registry}/{self.from_target_image}"
)
+ @property
+ def is_base_container_annotation_available(self) -> bool:
+ """return True if the obs-service-kiwi_metainfo_helper can provide base.name/digest annotations."""
+ return bool(self._from_image and not self.os_version.is_tumbleweed)
+
@property
def dockerfile_from_line(self) -> str:
if self._from_image is None:
diff --git a/src/bci_build/templates.py b/src/bci_build/templates.py
index 446b75fc9..52505d025 100644
--- a/src/bci_build/templates.py
+++ b/src/bci_build/templates.py
@@ -74,6 +74,10 @@
LABEL com.suse.release-stage="{{ image.release_stage }}"
{%- endif %}
# endlabelprefix
+{%- if image.is_base_container_annotation_available %}
+LABEL org.opencontainers.image.base.name="%BASE_REFNAME%"
+LABEL org.opencontainers.image.base.digest="%BASE_DIGEST%"
+{%- endif %}
LABEL io.artifacthub.package.readme-url="{{ image.readme_url }}"
{%- if image.logo_url %}
LABEL io.artifacthub.package.logo-url="{{ image.logo_url }}"
@@ -151,6 +155,10 @@
{{- image.extra_label_xml_lines }}
+{%- if image.is_base_container_annotation_available %}
+
+
+{%- endif %}
{% if image.logo_url %}
{% endif %}
diff --git a/tests/test_build_recipe.py b/tests/test_build_recipe.py
index c9f1105b0..8e062a1d5 100644
--- a/tests/test_build_recipe.py
+++ b/tests/test_build_recipe.py
@@ -51,6 +51,8 @@
LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle#suse-linux-enterprise-server-15"
LABEL com.suse.release-stage="released"
# endlabelprefix
+LABEL org.opencontainers.image.base.name="%BASE_REFNAME%"
+LABEL org.opencontainers.image.base.digest="%BASE_DIGEST%"
LABEL io.artifacthub.package.readme-url="%SOURCEURL%/README.md"
COPY test.el .
RUN emacs -Q --batch test.el
@@ -94,6 +96,8 @@
+
+
@@ -160,6 +164,8 @@
LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle#suse-linux-enterprise-server-15"
LABEL com.suse.release-stage="released"
# endlabelprefix
+LABEL org.opencontainers.image.base.name="%BASE_REFNAME%"
+LABEL org.opencontainers.image.base.digest="%BASE_DIGEST%"
LABEL io.artifacthub.package.readme-url="%SOURCEURL%/README.md"
""",
"""
@@ -200,6 +206,8 @@
+
+
@@ -261,6 +269,8 @@
LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle#suse-linux-enterprise-server-15"
LABEL com.suse.release-stage="released"
# endlabelprefix
+LABEL org.opencontainers.image.base.name="%BASE_REFNAME%"
+LABEL org.opencontainers.image.base.digest="%BASE_DIGEST%"
LABEL io.artifacthub.package.readme-url="%SOURCEURL%/README.md"
USER emacs""",
"""
@@ -302,6 +312,8 @@
+
+