From df148a26e58ebe50cb5de56c981df329eb643e8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Fri, 20 Sep 2024 11:13:56 +0200 Subject: [PATCH] Don't use the full registry url in FROM on Tumbleweed The Tumbleweed team doesn't want to have an external dependency (e.g. registry) in staging or Factory. --- src/bci_build/package/__init__.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/bci_build/package/__init__.py b/src/bci_build/package/__init__.py index 7a144ff1f..c8c5fe722 100644 --- a/src/bci_build/package/__init__.py +++ b/src/bci_build/package/__init__.py @@ -834,10 +834,13 @@ def dockerfile_from_line(self) -> str: return "" if self.from_target_image: - return ( - f"FROM {self.base_image_registry}/{self.from_target_image} AS target\n" - f"FROM {self._from_image} AS builder" + # build against the released container on SLE for proper base.digest/name generation + target: str = ( + self.from_target_image + if self.os_version.is_tumbleweed + else f"{self.base_image_registry}/{self.from_target_image}" ) + return f"FROM {target} AS target\nFROM {self._from_image} AS builder" return f"FROM {self._from_image}"