Skip to content

Commit

Permalink
Merge pull request #1414 from GoogleContainerTools/remove_node_deb_co…
Browse files Browse the repository at this point in the history
…ntrol

Disable writing control info for node archives
  • Loading branch information
loosebazooka authored Sep 29, 2023
2 parents 09cd044 + e2043fb commit 1aed4d3
Showing 1 changed file with 3 additions and 15 deletions.
18 changes: 3 additions & 15 deletions private/remote/node_archive.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,6 @@ pkg_tar(
srcs = ["control"]
)
dpkg_status(
name = "dpkg",
control = ":_control.tar",
package_name = "{package_name}"
)
pkg_tar(
name = "data_with_dpkg_status",
deps = [
":data",
":dpkg"
]
)
debian_spdx(
name = "spdx",
control = ":_control.tar",
Expand All @@ -52,7 +38,7 @@ debian_spdx(
merge_providers(
name = "{name}",
srcs = [":data_with_dpkg_status", ":spdx"],
srcs = [":data", ":spdx"],
visibility = ["//visibility:public"],
)
"""
Expand Down Expand Up @@ -96,6 +82,8 @@ node_archive = repository_rule(
"package_name": attr.string(default = "nodejs"),
"version": attr.string(mandatory = True),
"architecture": attr.string(mandatory = True),
# control is only used to populate the sbom, see https://github.com/GoogleContainerTools/distroless/issues/1373
# for why writing debian control files to the image is incompatible with scanners.
"control": attr.label(),
},
)

0 comments on commit 1aed4d3

Please sign in to comment.