Update Scout scanner to v1.4.1 #16184
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Diff for 2bed9ee:diff --git a/.external-pins/docker/scout-sbom-indexer___1/bashbrew.json b/.external-pins/docker/scout-sbom-indexer___1/bashbrew.json
index cace4ad..fe2f248 100644
--- a/.external-pins/docker/scout-sbom-indexer___1/bashbrew.json
+++ b/.external-pins/docker/scout-sbom-indexer___1/bashbrew.json
@@ -2,100 +2,100 @@
"arches": {
"amd64": [
{
- "digest": "sha256:740bc7f7b6ca8f4533b3852e8e0b43e748df4299ddfd646ea4e8908a14c9563a",
+ "digest": "sha256:9fd5a33e6351eb52299c52e8e2294a331ab4fb4934984abc11508499617862cc",
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"platform": {
"architecture": "amd64",
"os": "linux"
},
- "size": 673
+ "size": 861
}
],
"arm32v5": [
{
- "digest": "sha256:de6eaf74d7899f2e59a1ae355b6c5a2af1bd1b1e6ef8f868298cebac177cd3dc",
+ "digest": "sha256:c9e8820070db77281da1def5db9e9e555864104b2d1117f8f38e4d2aa43ae6c0",
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"platform": {
"architecture": "arm",
"os": "linux",
"variant": "v5"
},
- "size": 673
+ "size": 861
}
],
"arm32v7": [
{
- "digest": "sha256:e401d08bc6fa88a627692d39b08d26b62c078db03372f407aefe15e44a3167a7",
+ "digest": "sha256:0ffc7306ed623ecf1b99f6c3bd4365d5a2cad931984d97666c4233d0501d8adf",
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"platform": {
"architecture": "arm",
"os": "linux",
"variant": "v7"
},
- "size": 673
+ "size": 861
}
],
"arm64v8": [
{
- "digest": "sha256:6462f2a5298fd7075a20daf59820320edbb24e29c9d8c0598297ded7bbb95663",
+ "digest": "sha256:81aa2b19a619eadcbec214f7b182e7d814492238a6775107573c582678c3fc2e",
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"platform": {
"architecture": "arm64",
"os": "linux",
"variant": "v8"
},
- "size": 673
+ "size": 861
}
],
"i386": [
{
- "digest": "sha256:f3549662c36e2777ef2d92a891bf66c07a50c58986be12cdff92bc56db36f2ca",
+ "digest": "sha256:01edb2730c607de22d508bfa02a37f0e70153018c466d7b8de4e2caa866daf4c",
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"platform": {
"architecture": "386",
"os": "linux"
},
- "size": 673
+ "size": 861
}
],
"ppc64le": [
{
- "digest": "sha256:83954fe5b00c3005c6956735d990a27033d5c8623da3bcbff0be276016d97e09",
+ "digest": "sha256:ed61722730e8e8ae5ff5171f2c46de1459bdaa1876cd5cf088845f3b27476a66",
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"platform": {
"architecture": "ppc64le",
"os": "linux"
},
- "size": 673
+ "size": 861
}
],
"riscv64": [
{
- "digest": "sha256:8f4770d5ed8eb5cb718dec54fa0f9a15168b1559c29c06b0bf67c7f23136ac5b",
+ "digest": "sha256:e157d0c1f245d3979560d63e928bc04215f2b412a7c1be584e0d8a180c8e3dcc",
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"platform": {
"architecture": "riscv64",
"os": "linux"
},
- "size": 673
+ "size": 861
}
],
"s390x": [
{
- "digest": "sha256:992d7bb64b514ac5a6a8ebb87249def55b3b70a694d71bcc24a719caf09428de",
+ "digest": "sha256:46e4e2def0c2c525ad462b0f6ec966d742bd2bddc5776865e3026f21554e86bc",
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"platform": {
"architecture": "s390x",
"os": "linux"
},
- "size": 673
+ "size": 861
}
]
},
"desc": {
- "digest": "sha256:60dae27f30cb9c7aafbd237d1f74dbf05e254f530f0580d6d79c728de83a34ee",
+ "digest": "sha256:c8c722d4a96772af1ca1ef29fcb87d8a29e3e76b0e29815618654aa887f72e43",
"mediaType": "application/vnd.oci.image.index.v1+json",
"size": 6167
},
- "ref": "docker.io/docker/scout-sbom-indexer:1@sha256:60dae27f30cb9c7aafbd237d1f74dbf05e254f530f0580d6d79c728de83a34ee"
+ "ref": "docker.io/docker/scout-sbom-indexer:1@sha256:c8c722d4a96772af1ca1ef29fcb87d8a29e3e76b0e29815618654aa887f72e43"
}
diff --git a/.external-pins/docker/scout-sbom-indexer___1/manifest-sha256_740bc7f7b6ca8f4533b3852e8e0b43e748df4299ddfd646ea4e8908a14c9563a-config.json b/.external-pins/docker/scout-sbom-indexer___1/manifest-sha256_9fd5a33e6351eb52299c52e8e2294a331ab4fb4934984abc11508499617862cc-config.json
similarity index 59%
rename from .external-pins/docker/scout-sbom-indexer___1/manifest-sha256_740bc7f7b6ca8f4533b3852e8e0b43e748df4299ddfd646ea4e8908a14c9563a-config.json
rename to .external-pins/docker/scout-sbom-indexer___1/manifest-sha256_9fd5a33e6351eb52299c52e8e2294a331ab4fb4934984abc11508499617862cc-config.json
index 2e5e01e..996fc2c 100644
--- a/.external-pins/docker/scout-sbom-indexer___1/manifest-sha256_740bc7f7b6ca8f4533b3852e8e0b43e748df4299ddfd646ea4e8908a14c9563a-config.json
+++ b/.external-pins/docker/scout-sbom-indexer___1/manifest-sha256_9fd5a33e6351eb52299c52e8e2294a331ab4fb4934984abc11508499617862cc-config.json
@@ -10,39 +10,44 @@
],
"Labels": {
"com.docker.image.source.entrypoint": "Dockerfile",
- "org.opencontainers.image.created": "2024-01-17T15:45:07.396Z",
+ "org.opencontainers.image.created": "2024-02-02T15:20:24.018Z",
"org.opencontainers.image.description": "Docker Scout CLI Plugin",
"org.opencontainers.image.licenses": "",
- "org.opencontainers.image.revision": "1934037f9d1cd0875cd2e5817cb19545d446cbf5",
+ "org.opencontainers.image.revision": "8f8fca49ab253bee1898098cdba37d9362a1ad1d",
"org.opencontainers.image.source": "https://github.com/docker/scout-cli-plugin",
"org.opencontainers.image.title": "scout-cli-plugin",
"org.opencontainers.image.url": "https://github.com/docker/scout-cli-plugin",
- "org.opencontainers.image.version": "1.3.0"
+ "org.opencontainers.image.version": "1.4.1"
},
"OnBuild": null,
"WorkingDir": "/"
},
- "created": "2024-01-17T16:00:17.911570568Z",
+ "created": "2024-02-02T15:36:48.912579146Z",
"history": [
{
"comment": "buildkit.dockerfile.v0",
- "created": "2024-01-17T15:45:19.478860411Z",
+ "created": "2024-02-02T15:20:34.38089733Z",
"created_by": "COPY /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ # buildkit"
},
{
"comment": "buildkit.dockerfile.v0",
- "created": "2024-01-17T16:00:17.911570568Z",
+ "created": "2024-02-02T15:36:48.850860062Z",
"created_by": "COPY /go/src/dist/sbom-indexer /sbom-indexer # buildkit"
},
{
"comment": "buildkit.dockerfile.v0",
- "created": "2024-01-17T16:00:17.911570568Z",
+ "created": "2024-02-02T15:36:48.912579146Z",
+ "created_by": "COPY .vex/* /var/lib/db/vex/ # buildkit"
+ },
+ {
+ "comment": "buildkit.dockerfile.v0",
+ "created": "2024-02-02T15:36:48.912579146Z",
"created_by": "ENV COLORTERM=true",
"empty_layer": true
},
{
"comment": "buildkit.dockerfile.v0",
- "created": "2024-01-17T16:00:17.911570568Z",
+ "created": "2024-02-02T15:36:48.912579146Z",
"created_by": "ENTRYPOINT [\"/sbom-indexer\"]",
"empty_layer": true
}
@@ -50,8 +55,9 @@
"os": "linux",
"rootfs": {
"diff_ids": [
- "sha256:0c1369976f0b90fe82989c22e30dd17bb59204a07001dde4929dab34ea954dd5",
- "sha256:ade0de0819ea9ed5790f57ba248940e9a3527c66241780292b38471dbd0d813d"
+ "sha256:e2780970efe0ea5006a7ceb06be73c7b7236767d848ee7013b0c2b492a711f37",
+ "sha256:3298ad60eb56cef93ef1cd7d281713cfb4a30d34122e8d62cb28b23050ab942c",
+ "sha256:c9384f2e1276ac4fc8815ddbe54a41f86a5cc4379e6c329e38df3301d52894ff"
],
"type": "layers"
}
diff --git a/.external-pins/docker/scout-sbom-indexer___1/manifest-sha256_740bc7f7b6ca8f4533b3852e8e0b43e748df4299ddfd646ea4e8908a14c9563a.json b/.external-pins/docker/scout-sbom-indexer___1/manifest-sha256_9fd5a33e6351eb52299c52e8e2294a331ab4fb4934984abc11508499617862cc.json
similarity index 39%
rename from .external-pins/docker/scout-sbom-indexer___1/manifest-sha256_740bc7f7b6ca8f4533b3852e8e0b43e748df4299ddfd646ea4e8908a14c9563a.json
rename to .external-pins/docker/scout-sbom-indexer___1/manifest-sha256_9fd5a33e6351eb52299c52e8e2294a331ab4fb4934984abc11508499617862cc.json
index a8c0ec1..59c9214 100644
--- a/.external-pins/docker/scout-sbom-indexer___1/manifest-sha256_740bc7f7b6ca8f4533b3852e8e0b43e748df4299ddfd646ea4e8908a14c9563a.json
+++ b/.external-pins/docker/scout-sbom-indexer___1/manifest-sha256_9fd5a33e6351eb52299c52e8e2294a331ab4fb4934984abc11508499617862cc.json
@@ -1,19 +1,24 @@
{
"config": {
- "digest": "sha256:4b49a20eef75d986338850aeefa25fb229e15f26ee504e54bf776bd51027da0e",
+ "digest": "sha256:58fb35ab71e25e71da67d38175bef7903c9d43d443d44de20e790547f97cd7ff",
"mediaType": "application/vnd.oci.image.config.v1+json",
- "size": 1594
+ "size": 1802
},
"layers": [
{
- "digest": "sha256:52d22b1fb9321e50f2192e6615cc8ab8d318b311ca10774a42c51d103997a1d3",
+ "digest": "sha256:3b43e88819526d6fb75d8a7841f65635dae1f5e55fa3c86300931fd6eaccbe80",
"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
- "size": 123561
+ "size": 123562
},
{
- "digest": "sha256:5b0f63cd215dbc328d3d8208ba84212cfda3fe39a5526158dcf4c059443aab94",
+ "digest": "sha256:dd8b6c8035e54c36fed0f9555cb34032eb8f889e01e1f20ec42b462fd18d7b51",
"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
- "size": 18361286
+ "size": 18608108
+ },
+ {
+ "digest": "sha256:89836becc7487aa4799b6976b25fd929b47248856b38bf2a4a0e09f490f6cb59",
+ "mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
+ "size": 596
}
],
"mediaType": "application/vnd.oci.image.manifest.v1+json", |
tianon
approved these changes
Feb 2, 2024
|
I think if you reopen before force pushing it should let you (but if you've force pushed the branch first, it locks the PR from reopening, I believe). |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resurrects #16170 (I don't seem to have the permission to reopen my closed PRs)