Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions apt/extensions.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,7 @@ def _distroless_extension(mctx):
resolution_queue = []
already_resolved = {}
dependency_set_mergedusr = {}
dependency_set_package_template = {}
package_repo_roots = {
False: {},
True: {},
Expand All @@ -335,6 +336,8 @@ def _distroless_extension(mctx):
if install.dependency_set:
current_mergedusr = dependency_set_mergedusr.get(install.dependency_set, False)
dependency_set_mergedusr[install.dependency_set] = current_mergedusr or install.mergedusr
if install.dependency_set not in dependency_set_package_template and install.package_template != None:
dependency_set_package_template[install.dependency_set] = install.package_template

for dep_constraint in install.packages:
constraint = version_constraint.parse_dep(dep_constraint)
Expand Down Expand Up @@ -477,11 +480,15 @@ def _distroless_extension(mctx):
package_repo_modes = compute_package_repo_modes(glock.packages(), package_repo_roots)
for depset_name in dependency_sets.keys():
depset_mergedusr = dependency_set_mergedusr.get(depset_name, False)
kwargs = {}
if depset_name in dependency_set_package_template:
kwargs["package_template"] = dependency_set_package_template[depset_name]
translate_dependency_set(
name = depset_name,
depset_name = depset_name,
lock_content = lock_content,
mergedusr = depset_mergedusr,
**kwargs
)

# Generate a repo per package which will be aliased by hub repo.
Expand Down Expand Up @@ -657,6 +664,9 @@ install = tag_class(
"suites": attr.string_list(),
"include_transitive": attr.bool(default = True),
"mergedusr": attr.bool(default = False),
"package_template": attr.label(
allow_single_file = True,
),
},
)

Expand Down