Skip to content

Commit

Permalink
Remove perl from minimmal image in Tumbleweed
Browse files Browse the repository at this point in the history
  • Loading branch information
dirkmueller committed Jul 10, 2023
1 parent 81d67fc commit c653941
Showing 1 changed file with 28 additions and 15 deletions.
43 changes: 28 additions & 15 deletions src/bci_build/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -2251,28 +2251,41 @@ def _create_php_bci(
for os_version in ALL_BASE_OS_VERSIONS
]


def _get_minimal_kwargs(os_version: OsVersion):
package_list = [
Package(name, pkg_type=PackageType.DELETE)
for name in ("grep", "diffutils", "info", "fillup", "libzio1")
] + [Package("distribution-release", pkg_type=PackageType.BOOTSTRAP)]


# in SLE15, rpm still depends on Perl. This has been fixed in Tumbleweed
if os_version == OsVersion.TUMBLEWEED:
package_list.append(Package("rpm", pkg_type=PackageType.BOOTSTRAP))
else:
package_list += [
Package(name, pkg_type=PackageType.BOOTSTRAP)
for name in ("rpm-ndb", "perl-base")
]

kwargs = {
"from_image": f"{_build_tag_prefix(os_version)}/bci-micro:{OsContainer.version_to_container_os_version(os_version)}",
"pretty_name": f"{os_version.pretty_os_version_no_dash} Minimal",
"package_list": package_list,
}

return kwargs


MINIMAL_CONTAINERS = [
OsContainer(
name="minimal",
from_image=f"{_build_tag_prefix(os_version)}/bci-micro:{OsContainer.version_to_container_os_version(os_version)}",
os_version=os_version,
**_get_minimal_kwargs(os_version),
support_level=SupportLevel.L3,
is_latest=os_version in CAN_BE_LATEST_OS_VERSION,
package_name="minimal-image",
os_version=os_version,
build_recipe_type=BuildType.KIWI,
pretty_name=f"{os_version.pretty_os_version_no_dash} Minimal",
package_list=[
Package(name, pkg_type=PackageType.BOOTSTRAP)
for name in (
"rpm" if os_version == OsVersion.TUMBLEWEED else "rpm-ndb",
"perl-base",
"distribution-release",
)
]
+ [
Package(name, pkg_type=PackageType.DELETE)
for name in ("grep", "diffutils", "info", "fillup", "libzio1")
],
)
for os_version in ALL_BASE_OS_VERSIONS
]
Expand Down

0 comments on commit c653941

Please sign in to comment.