Merge pull request #1658 from SUSE/coreutils

Install sles-release with coreutils
SUSE · Sep 16, 2024 · 103d122 · 103d122
2 parents e0795ab + 19ebbe1
commit 103d122
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/src/bci_build/package/__init__.py b/src/bci_build/package/__init__.py
@@ -262,8 +262,6 @@ def release_package_names(self) -> tuple[str, ...]:
             return ("SLES-release",)
         if self.is_ltss:
             return ("sles-ltss-release",)
-        # if self.is_slcc:
-        #     return (f"{str(self.value).lower()}-release",)
 
         assert self.is_sle15
         return ("sles-release",)

diff --git a/src/bci_build/package/basecontainers.py b/src/bci_build/package/basecontainers.py
@@ -170,7 +170,7 @@ def _get_supported_until_fips(os_version: OsVersion) -> datetime.date:
         supported_until=_get_supported_until_fips(os_version),
         is_latest=os_version in CAN_BE_LATEST_OS_VERSION,
         pretty_name=_get_fips_pretty_name(os_version),
-        package_list=[*os_version.release_package_names]
+        package_list=[*os_version.release_package_names, "coreutils"]
         + (
             ["fipscheck"]
             if os_version == OsVersion.SP3

diff --git a/src/dotnet/updater.py b/src/dotnet/updater.py
@@ -91,7 +91,7 @@
 {% endfor %}
 
 # Workaround for https://github.com/openSUSE/obs-build/issues/487
-RUN zypper --non-interactive install --no-recommends sles-release
+RUN zypper --non-interactive install --no-recommends coreutils sles-release
 
 # Importing MS GPG keys
 COPY microsoft.asc /tmp