Skip to content

Commit

Permalink
Drop other mentions of distribution-release
Browse files Browse the repository at this point in the history
The languagestack shouldn't need those as the base containers
already include them.
  • Loading branch information
dirkmueller committed Jul 11, 2023
1 parent a5d0be4 commit 05fd9b6
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions src/bci_build/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -1342,7 +1342,6 @@ def _get_ruby_kwargs(ruby_version: Literal["2.5", "3.2"], os_version: OsVersion)
"util-linux",
"curl",
"git-core",
"distribution-release",
# additional dependencies to build rails, ffi, sqlite3 gems -->
"gcc-c++",
"sqlite3-devel",
Expand Down Expand Up @@ -1403,7 +1402,7 @@ def _get_golang_kwargs(
regex_in_build_description=golang_version_regex, package_name=go
)
],
"package_list": [go, "distribution-release", "make", "git-core"],
"package_list": [go, "make", "git-core"],
"extra_files": {
# the go binaries are huge and will ftbfs on workers with a root partition with 4GB
"_constraints": generate_disk_size_constraints(8)
Expand Down Expand Up @@ -1457,7 +1456,6 @@ def _get_node_kwargs(ver: Literal[16, 18, 20], os_version: OsVersion):
"git-core",
# dependency of nodejs:
"update-alternatives",
"distribution-release",
],
"env": {
"NODE_VERSION": ver,
Expand Down Expand Up @@ -1943,7 +1941,7 @@ def _get_os_container_package_names(os_version: OsVersion):
name="postgres",
pretty_name=f"PostgreSQL {ver}",
support_level=SupportLevel.ACC,
package_list=[f"postgresql{ver}-server", "distribution-release"],
package_list=[f"postgresql{ver}-server"],
version=ver,
additional_versions=["%%pg_version%%"],
entrypoint=["/usr/local/bin/docker-entrypoint.sh"],
Expand Down Expand Up @@ -2130,7 +2128,7 @@ def _get_os_container_package_names(os_version: OsVersion):
parse_version="minor",
)
],
package_list=["nginx", "distribution-release"],
package_list=["nginx"],
entrypoint=["/docker-entrypoint.sh"],
cmd=["nginx", "-g", "daemon off;"],
build_recipe_type=BuildType.DOCKER,
Expand Down Expand Up @@ -2197,7 +2195,6 @@ def _get_os_container_package_names(os_version: OsVersion):
package_list=[
f"rust{rust_version}",
f"cargo{rust_version}",
"distribution-release",
],
version=rust_version,
env={
Expand Down

0 comments on commit 05fd9b6

Please sign in to comment.