Merge pull request #3374 from SUSE/third-rarty-repo

Add ThirdPartyRepoMixin

Author: dirkmueller

pyproject.toml

@@ -11,7 +11,6 @@ packages = [
     { include = "bci_dockerfile_generator", from = "src" },
     { include = "bci_build", from = "src" },
     { include = "staging", from = "src" },
-    { include = "dotnet", from = "src" },
 ]
 requires-python = ">=3.11,<4.0"
 

src/bci_build/package/__init__.py

@@ -664,14 +664,11 @@ def kiwi_derived_from_entry(self) -> str:
 
     @property
     def packages(self) -> str:
-        """The list of packages joined so that it can be appended to a
-        :command:`zypper install`.
-
-        """
+        """The packages list so that it can be appended to a :command:`zypper install`."""
         packages_to_install: list[str] = []
         for pkg in self.package_list:
             if isinstance(pkg, Package):
-                if pkg.pkg_type == PackageType.DELETE:
+                if pkg.pkg_type in (PackageType.DELETE, PackageType.BOOTSTRAP):
                     continue
                 if pkg.pkg_type != PackageType.IMAGE:
                     raise ValueError(
@@ -680,9 +677,19 @@ def packages(self) -> str:
             packages_to_install.append(str(pkg))
         return " ".join(packages_to_install)
 
+    @property
+    def packages_to_bootstrap(self) -> str:
+        """The packages list that is installed in the first stage in a multi stage image."""
+        packages: list[str] = [
+            str(pkg)
+            for pkg in self.package_list
+            if (isinstance(pkg, Package) and pkg.pkg_type == PackageType.BOOTSTRAP)
+        ]
+        return " ".join(packages)
+
     @property
     def packages_to_delete(self) -> str:
-        """The list of packages joined that can be passed to zypper -n rm after an install`."""
+        """The packages list that can be passed to zypper -n rm after an install`."""
         packages_to_delete: list[str] = [
             str(pkg)
             for pkg in self.package_list
@@ -1068,6 +1075,8 @@ async def write_files_to_folder(self, dest: str) -> list[str]:
 
         self.prepare_template()
 
+        os.makedirs(dest, mode=0o755, exist_ok=True)
+
         async def write_file_to_dest(fname: str, contents: str | bytes) -> None:
             await write_to_file(os.path.join(dest, fname), contents)
 
@@ -1459,8 +1468,6 @@ def generate_disk_size_constraints(size_gb: int) -> str:
 """
 
 
-from dotnet.updater import DOTNET_CONTAINERS  # noqa: E402
-
 from .apache_tomcat import TOMCAT_CONTAINERS  # noqa: E402
 from .appcontainers import ALERTMANAGER_CONTAINERS  # noqa: E402
 from .appcontainers import BLACKBOX_EXPORTER_CONTAINERS  # noqa: E402
@@ -1480,6 +1487,7 @@ def generate_disk_size_constraints(size_gb: int) -> str:
 from .basecontainers import MINIMAL_CONTAINERS  # noqa: E402
 from .bind import BIND_CONTAINERS  # noqa: E402
 from .cosign import COSIGN_CONTAINERS  # noqa: E402
+from .dotnet import DOTNET_CONTAINERS  # noqa: E402
 from .firefox import FIREFOX_CONTAINERS  # noqa: E402
 from .gcc import GCC_CONTAINERS  # noqa: E402
 from .git import GIT_CONTAINERS  # noqa: E402