Update SBOM indexer to 1.14.1 #17629
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
This fixes the issue with empty SBOMs in the new GHA images / Ubuntu 22.04 update.
Diff for c079a2f:diff --git a/.external-pins/docker/scout-sbom-indexer___1-doi/bashbrew.json b/.external-pins/docker/scout-sbom-indexer___1-doi/bashbrew.json
index 643a2ee..5d7eb7e 100644
--- a/.external-pins/docker/scout-sbom-indexer___1-doi/bashbrew.json
+++ b/.external-pins/docker/scout-sbom-indexer___1-doi/bashbrew.json
@@ -2,100 +2,100 @@
"arches": {
"amd64": [
{
- "digest": "sha256:ab1497a14c50f8632b615c2de9bcfbcef73c12c6636c13d0d5684958ff6ab38b",
+ "digest": "sha256:3c5a6776b4361b270937c944c136ebb35fb8de65878deb9f22721c740298b877",
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"platform": {
"architecture": "amd64",
"os": "linux"
},
- "size": 1423
+ "size": 1613
}
],
"arm32v5": [
{
- "digest": "sha256:6f53056ecabcb6332b0ff03e3e3a676c105d451a21095d7e840b805cf8c2c93a",
+ "digest": "sha256:d26b3d8f41ce11cc98c06a918d3afd25f5b36a1c8cc0ce1f9161e0ea9c63c080",
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"platform": {
"architecture": "arm",
"os": "linux",
"variant": "v5"
},
- "size": 1423
+ "size": 1613
}
],
"arm32v7": [
{
- "digest": "sha256:8e386b2c60321f8db777b9207ef5e2fc70c5755fa09594bfbe413ab4a7d1a5ef",
+ "digest": "sha256:fe0f07b2d1f32a8f2cdc64defcd0d783d498b651e9c565fadec1a05e5d1e6eff",
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"platform": {
"architecture": "arm",
"os": "linux",
"variant": "v7"
},
- "size": 1423
+ "size": 1613
}
],
"arm64v8": [
{
- "digest": "sha256:cf162ffe28641f592908a44de5d3a7de530739ef9ffc2864c2e50fad4d401b6d",
+ "digest": "sha256:c3bcaf528de18672cee37a781da7e6aeba94b2b0239045c5429a3a74b47a0417",
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"platform": {
"architecture": "arm64",
"os": "linux",
"variant": "v8"
},
- "size": 1423
+ "size": 1613
}
],
"i386": [
{
- "digest": "sha256:8dbda11125a7074b9368394c546d1f6ef3b68c07e72b28e531001d13722a793a",
+ "digest": "sha256:7264a6862027d997b733f6118e40f117891ec9f64f1e2c3ecb37c55c7da028ec",
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"platform": {
"architecture": "386",
"os": "linux"
},
- "size": 1423
+ "size": 1613
}
],
"ppc64le": [
{
- "digest": "sha256:26791e9fb18785804d4ea8c684ab0613b79e470af14754d038c01968b5e7ac15",
+ "digest": "sha256:e001f8ea82bb476917d5f35fda434347afafb23c823d4ea9018658a8b7929767",
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"platform": {
"architecture": "ppc64le",
"os": "linux"
},
- "size": 1423
+ "size": 1613
}
],
"riscv64": [
{
- "digest": "sha256:3850a55013f8e9e40e0e62aa51ce2871e06ea42f3a2fa575a6e0b0f1f2e00600",
+ "digest": "sha256:4522b218f6a5f6a18d75987bc7dafba442c2950133894ffab8b20b420ce94b70",
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"platform": {
"architecture": "riscv64",
"os": "linux"
},
- "size": 1423
+ "size": 1613
}
],
"s390x": [
{
- "digest": "sha256:a3cc7ec53215cf6ee9030936e87502047c9ad3f41e46a803f3c881f6d2190729",
+ "digest": "sha256:99e8684a97974938ad5000ef2f8ebe4ace56ccd008ce995e78f391430ae4851d",
"mediaType": "application/vnd.oci.image.manifest.v1+json",
"platform": {
"architecture": "s390x",
"os": "linux"
},
- "size": 1423
+ "size": 1613
}
]
},
"desc": {
- "digest": "sha256:b495a9ecea0314d3623c7d432498ca34cf1fdd212b1bb85765332038b3d9cd41",
+ "digest": "sha256:45ba05d54d01ed53a964a0f09d9d638a3af7c0c15448cafd58995ef3ce27ee09",
"mediaType": "application/vnd.oci.image.index.v1+json",
"size": 6175
},
- "ref": "docker.io/docker/scout-sbom-indexer:1-doi@sha256:b495a9ecea0314d3623c7d432498ca34cf1fdd212b1bb85765332038b3d9cd41"
+ "ref": "docker.io/docker/scout-sbom-indexer:1-doi@sha256:45ba05d54d01ed53a964a0f09d9d638a3af7c0c15448cafd58995ef3ce27ee09"
}
diff --git a/.external-pins/docker/scout-sbom-indexer___1-doi/manifest-sha256_ab1497a14c50f8632b615c2de9bcfbcef73c12c6636c13d0d5684958ff6ab38b-config.json b/.external-pins/docker/scout-sbom-indexer___1-doi/manifest-sha256_3c5a6776b4361b270937c944c136ebb35fb8de65878deb9f22721c740298b877-config.json
similarity index 57%
rename from .external-pins/docker/scout-sbom-indexer___1-doi/manifest-sha256_ab1497a14c50f8632b615c2de9bcfbcef73c12c6636c13d0d5684958ff6ab38b-config.json
rename to .external-pins/docker/scout-sbom-indexer___1-doi/manifest-sha256_3c5a6776b4361b270937c944c136ebb35fb8de65878deb9f22721c740298b877-config.json
index c949e0e..62d71e1 100644
--- a/.external-pins/docker/scout-sbom-indexer___1-doi/manifest-sha256_ab1497a14c50f8632b615c2de9bcfbcef73c12c6636c13d0d5684958ff6ab38b-config.json
+++ b/.external-pins/docker/scout-sbom-indexer___1-doi/manifest-sha256_3c5a6776b4361b270937c944c136ebb35fb8de65878deb9f22721c740298b877-config.json
@@ -12,72 +12,77 @@
],
"Labels": {
"com.docker.image.source.entrypoint": "Dockerfile",
- "org.opencontainers.image.created": "2024-09-06T07:41:33.582Z",
+ "org.opencontainers.image.created": "2024-09-26T11:11:33.075Z",
"org.opencontainers.image.description": "Docker Scout CLI Plugin",
"org.opencontainers.image.licenses": "",
- "org.opencontainers.image.revision": "c356a07546f34f9a5f5da544e31aad39e634bf58",
- "org.opencontainers.image.source": "https://github.com/docker/scout-cli-plugin",
+ "org.opencontainers.image.revision": "99feeb65a0824ce8cf2ba4030dae010b3ce84957",
+ "org.opencontainers.image.source": "[email protected]:docker/scout-cli-plugin.git",
"org.opencontainers.image.title": "scout-cli-plugin",
"org.opencontainers.image.url": "https://github.com/docker/scout-cli-plugin",
- "org.opencontainers.image.version": "1.14.0-doi"
+ "org.opencontainers.image.version": "1.14.1"
},
"OnBuild": null,
"User": "docker-scout",
"WorkingDir": "/"
},
- "created": "2024-09-06T07:45:20.250223122Z",
+ "created": "2024-09-26T10:11:12.841167179Z",
"history": [
{
"comment": "buildkit.dockerfile.v0",
- "created": "2024-09-06T07:41:39.042707506Z",
+ "created": "2024-09-26T10:11:11.344516595Z",
"created_by": "COPY /etc/passwd /etc/passwd # buildkit"
},
{
"comment": "buildkit.dockerfile.v0",
- "created": "2024-09-06T07:41:39.07776479Z",
+ "created": "2024-09-26T10:11:11.489322595Z",
+ "created_by": "COPY /etc/group /etc/group # buildkit"
+ },
+ {
+ "comment": "buildkit.dockerfile.v0",
+ "created": "2024-09-26T10:11:11.770099303Z",
"created_by": "COPY /empty /tmp # buildkit"
},
{
"comment": "buildkit.dockerfile.v0",
- "created": "2024-09-06T07:41:39.14491316Z",
+ "created": "2024-09-26T10:11:11.945712553Z",
"created_by": "COPY /empty /home # buildkit"
},
{
"comment": "buildkit.dockerfile.v0",
- "created": "2024-09-06T07:41:47.236450206Z",
+ "created": "2024-09-26T10:11:12.095723178Z",
"created_by": "COPY /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ # buildkit"
},
{
"comment": "buildkit.dockerfile.v0",
- "created": "2024-09-06T07:45:20.239285408Z",
+ "created": "2024-09-26T10:11:12.595110053Z",
"created_by": "COPY /go/src/dist/sbom-indexer /sbom-indexer # buildkit"
},
{
"comment": "buildkit.dockerfile.v0",
- "created": "2024-09-06T07:45:20.250223122Z",
+ "created": "2024-09-26T10:11:12.841167179Z",
"created_by": "COPY .vex/* /var/lib/db/vex/ # buildkit"
},
{
"comment": "buildkit.dockerfile.v0",
- "created": "2024-09-06T07:45:20.250223122Z",
+ "created": "2024-09-26T10:11:12.841167179Z",
"created_by": "ENV COLORTERM=true",
"empty_layer": true
},
{
"comment": "buildkit.dockerfile.v0",
- "created": "2024-09-06T07:45:20.250223122Z",
+ "created": "2024-09-26T10:11:12.841167179Z",
"created_by": "USER docker-scout",
"empty_layer": true
},
{
"comment": "buildkit.dockerfile.v0",
- "created": "2024-09-06T07:45:20.250223122Z",
+ "created": "2024-09-26T10:11:12.841167179Z",
"created_by": "ENTRYPOINT [\"/sbom-indexer\"]",
"empty_layer": true
},
{
"comment": "buildkit.dockerfile.v0",
- "created": "2024-09-06T07:45:20.250223122Z",
+ "created": "2024-09-26T10:11:12.841167179Z",
"created_by": "ENV DOCKER_SCOUT_SBOM_CATALOGERS=php-composer-lock,erlang-otp-application,lua-rock-cataloger DOCKER_SCOUT_ENVIRONMENT=indexer",
"empty_layer": true
}
@@ -85,12 +90,13 @@
"os": "linux",
"rootfs": {
"diff_ids": [
- "sha256:6a3cb7c78c5e75d3d41bdfb442c783dd4b0a27e2e66042f1ba881be655f5f51b",
- "sha256:c2aa1afd08ee602fa2c64a67cd7b8edc9392b176609da7a394a75a1681a15f0a",
- "sha256:a7f02ba090480907f1b28c83294ed2d639c4a739613d80830edffb31d5985a67",
- "sha256:992a95799e5a834470b62a8c8b90b4e3d1a5cecc746c86e0f7f51b2490b67caa",
- "sha256:bee174e1b2c1c36a8602a9f3ab1c80612aa7aa7632136aa37683c1a9169b2825",
- "sha256:07a21b757e7f703465211dbc264e3ec14586d01f20b874c3a5939ceec0d55720"
+ "sha256:c2e7db17869c519cbc27a0e88fb169d7ac14dbe348bb448e25300a9bd9e10289",
+ "sha256:1a4c8454197c59eb8927d3aab61af0f698d5ed5195b68e27213421a2a062b51a",
+ "sha256:aff3f1f5ba469bd5bbd14ba98911f409a750c39243bf0868eba961bbca5627b9",
+ "sha256:e0c91b38aeadd65e1d497e2ea3ecfdb49c3bcad981efceecbdb5bd19f1976a45",
+ "sha256:24a813be93b828664775c7096fb307357fd688d09c9ae955cf79daad1405a068",
+ "sha256:b65e29c4a139e0648d54286742ac93ed2800318f464e82e78553a72023020d3c",
+ "sha256:4d603c7fd9ad101b8b1d317c6d203f4fc605ac2d2c29b54c6e743a0d83f4c006"
],
"type": "layers"
}
diff --git a/.external-pins/docker/scout-sbom-indexer___1-doi/manifest-sha256_ab1497a14c50f8632b615c2de9bcfbcef73c12c6636c13d0d5684958ff6ab38b.json b/.external-pins/docker/scout-sbom-indexer___1-doi/manifest-sha256_3c5a6776b4361b270937c944c136ebb35fb8de65878deb9f22721c740298b877.json
similarity index 40%
rename from .external-pins/docker/scout-sbom-indexer___1-doi/manifest-sha256_ab1497a14c50f8632b615c2de9bcfbcef73c12c6636c13d0d5684958ff6ab38b.json
rename to .external-pins/docker/scout-sbom-indexer___1-doi/manifest-sha256_3c5a6776b4361b270937c944c136ebb35fb8de65878deb9f22721c740298b877.json
index 1acdbf3..1cf3c33 100644
--- a/.external-pins/docker/scout-sbom-indexer___1-doi/manifest-sha256_ab1497a14c50f8632b615c2de9bcfbcef73c12c6636c13d0d5684958ff6ab38b.json
+++ b/.external-pins/docker/scout-sbom-indexer___1-doi/manifest-sha256_3c5a6776b4361b270937c944c136ebb35fb8de65878deb9f22721c740298b877.json
@@ -1,39 +1,44 @@
{
"config": {
- "digest": "sha256:b0a921693ad20cf58d67dc144ac5a4d7bd369abcd3dbb311356a31c8dc6be0dd",
+ "digest": "sha256:275a9a4a7dcd216152bec51880289ed660b1f80a58c7e6c2b183319a98fe8cdf",
"mediaType": "application/vnd.oci.image.config.v1+json",
- "size": 2930
+ "size": 3135
},
"layers": [
{
- "digest": "sha256:8b006c3348ce4e048ce98af0978f5dc110be65aee999bb4b700b87d9c4e3d3af",
+ "digest": "sha256:f3a5c7d3228f67d0db71a6084e30f4d1f38feaae83b7c2e2f70e2fd129ab9a4d",
"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
- "size": 447
+ "size": 451
},
{
- "digest": "sha256:b576533ae4a987d1c49579c742a2b3a44807e421c32690f9381fdf6eb266135b",
+ "digest": "sha256:e902181874be737a507b8bcae27e0902bb3678a13ddd8076b6df5dd656eb4597",
"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
- "size": 96
+ "size": 429
},
{
- "digest": "sha256:211389bb5909d47cacbba77539f0d5a98119f3a608712a1d5dd58a569560bb03",
+ "digest": "sha256:89567579757e2d7255a9bc1d2219ebc28f86c441c8f5b779f338d13547c3fc90",
"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
- "size": 97
+ "size": 100
},
{
- "digest": "sha256:9ea8a5b7a02298c8d7a5136ba157987414af373c6582c98b672b8978e1731685",
+ "digest": "sha256:7c800b5d298c597963542e819d4158c505f58ce22621ec973e1e2a321c33fbf4",
"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
- "size": 126709
+ "size": 101
},
{
- "digest": "sha256:b13241ba19637fcd6451db09cf1fe8fd42d9f7da44b3dfc1d595ae5a5f57fd98",
+ "digest": "sha256:f4b8b819df520f8175b38883ab4f50b9dca5cc5c3428f91ea1f946c97884d591",
"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
- "size": 19869302
+ "size": 126708
},
{
- "digest": "sha256:e86ba9ed59a88396c5236801a17a7544a9fd1ca66543ec6326d79291f25b6804",
+ "digest": "sha256:62f9846e8552bce261a6e452b7277ee3cb865327570bdc9caf8668f33ed05197",
"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
- "size": 642
+ "size": 19900968
+ },
+ {
+ "digest": "sha256:d8c34e4c24710f11f094c21333c9bd908228356a40b42500c0de543da4d7a00f",
+ "mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
+ "size": 646
}
],
"mediaType": "application/vnd.oci.image.manifest.v1+json", |
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.
This fixes the issue with empty SBOMs in the new GHA images / Ubuntu 22.04 update.
See also: