Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update docker/scout-sbom-indexer:1 … #16268

Merged

Conversation

tianon
Copy link
Member

@tianon tianon commented Feb 16, 2024

…to sha256:660cc838b79f712369273e91c985b547026bb750a371a027a2a24a771cc02620

@tianon tianon requested a review from yosifkit as a code owner February 16, 2024 18:03
@tianon
Copy link
Member Author

tianon commented Feb 16, 2024

@LaurentGoderre this one is good to take, right? (no reason we should wait on it?)

Copy link

Diff for 7f65227:
diff --git a/.external-pins/docker/scout-sbom-indexer___1/bashbrew.json b/.external-pins/docker/scout-sbom-indexer___1/bashbrew.json
index fe2f248..82d2974 100644
--- a/.external-pins/docker/scout-sbom-indexer___1/bashbrew.json
+++ b/.external-pins/docker/scout-sbom-indexer___1/bashbrew.json
@@ -2,7 +2,7 @@
 	"arches": {
 		"amd64": [
 			{
-				"digest": "sha256:9fd5a33e6351eb52299c52e8e2294a331ab4fb4934984abc11508499617862cc",
+				"digest": "sha256:12b2a5d0ce712fc7c8983abb99d0a649b02707f968575964f862c682884e7d8f",
 				"mediaType": "application/vnd.oci.image.manifest.v1+json",
 				"platform": {
 					"architecture": "amd64",
@@ -13,7 +13,7 @@
 		],
 		"arm32v5": [
 			{
-				"digest": "sha256:c9e8820070db77281da1def5db9e9e555864104b2d1117f8f38e4d2aa43ae6c0",
+				"digest": "sha256:dd40fab6ef822eed5dce8b310da8ffe837e63495181ab3dd8f15689921315bfc",
 				"mediaType": "application/vnd.oci.image.manifest.v1+json",
 				"platform": {
 					"architecture": "arm",
@@ -25,7 +25,7 @@
 		],
 		"arm32v7": [
 			{
-				"digest": "sha256:0ffc7306ed623ecf1b99f6c3bd4365d5a2cad931984d97666c4233d0501d8adf",
+				"digest": "sha256:a7e5a015f9db59cc9959a94a1c0f3679144577ee12b9f38929e209f51c37231f",
 				"mediaType": "application/vnd.oci.image.manifest.v1+json",
 				"platform": {
 					"architecture": "arm",
@@ -37,7 +37,7 @@
 		],
 		"arm64v8": [
 			{
-				"digest": "sha256:81aa2b19a619eadcbec214f7b182e7d814492238a6775107573c582678c3fc2e",
+				"digest": "sha256:673516cf0576758ce05a295866d54e23cb72f37e8b84a38993d28f83b45c904f",
 				"mediaType": "application/vnd.oci.image.manifest.v1+json",
 				"platform": {
 					"architecture": "arm64",
@@ -49,7 +49,7 @@
 		],
 		"i386": [
 			{
-				"digest": "sha256:01edb2730c607de22d508bfa02a37f0e70153018c466d7b8de4e2caa866daf4c",
+				"digest": "sha256:ccaecd5062859495c2c350fa429b1a707dfba9b7528202d25a224ffbd97453e9",
 				"mediaType": "application/vnd.oci.image.manifest.v1+json",
 				"platform": {
 					"architecture": "386",
@@ -60,7 +60,7 @@
 		],
 		"ppc64le": [
 			{
-				"digest": "sha256:ed61722730e8e8ae5ff5171f2c46de1459bdaa1876cd5cf088845f3b27476a66",
+				"digest": "sha256:59e72f7f74faa7d949773989c2e9a8c0af3099dd2a51a1e36b4de1a0235b4f1d",
 				"mediaType": "application/vnd.oci.image.manifest.v1+json",
 				"platform": {
 					"architecture": "ppc64le",
@@ -71,7 +71,7 @@
 		],
 		"riscv64": [
 			{
-				"digest": "sha256:e157d0c1f245d3979560d63e928bc04215f2b412a7c1be584e0d8a180c8e3dcc",
+				"digest": "sha256:ab5002b15f24d90423da73007d200aba3fe93e6c836c137564277d2faaeb24b6",
 				"mediaType": "application/vnd.oci.image.manifest.v1+json",
 				"platform": {
 					"architecture": "riscv64",
@@ -82,7 +82,7 @@
 		],
 		"s390x": [
 			{
-				"digest": "sha256:46e4e2def0c2c525ad462b0f6ec966d742bd2bddc5776865e3026f21554e86bc",
+				"digest": "sha256:473f9c5392831894949a1a54873143e87a543e08075db33c5617894c573d3d12",
 				"mediaType": "application/vnd.oci.image.manifest.v1+json",
 				"platform": {
 					"architecture": "s390x",
@@ -93,9 +93,9 @@
 		]
 	},
 	"desc": {
-		"digest": "sha256:c8c722d4a96772af1ca1ef29fcb87d8a29e3e76b0e29815618654aa887f72e43",
+		"digest": "sha256:660cc838b79f712369273e91c985b547026bb750a371a027a2a24a771cc02620",
 		"mediaType": "application/vnd.oci.image.index.v1+json",
 		"size": 6167
 	},
-	"ref": "docker.io/docker/scout-sbom-indexer:1@sha256:c8c722d4a96772af1ca1ef29fcb87d8a29e3e76b0e29815618654aa887f72e43"
+	"ref": "docker.io/docker/scout-sbom-indexer:1@sha256:660cc838b79f712369273e91c985b547026bb750a371a027a2a24a771cc02620"
 }
diff --git a/.external-pins/docker/scout-sbom-indexer___1/manifest-sha256_9fd5a33e6351eb52299c52e8e2294a331ab4fb4934984abc11508499617862cc-config.json b/.external-pins/docker/scout-sbom-indexer___1/manifest-sha256_12b2a5d0ce712fc7c8983abb99d0a649b02707f968575964f862c682884e7d8f-config.json
similarity index 65%
rename from .external-pins/docker/scout-sbom-indexer___1/manifest-sha256_9fd5a33e6351eb52299c52e8e2294a331ab4fb4934984abc11508499617862cc-config.json
rename to .external-pins/docker/scout-sbom-indexer___1/manifest-sha256_12b2a5d0ce712fc7c8983abb99d0a649b02707f968575964f862c682884e7d8f-config.json
index 996fc2c..49836ae 100644
--- a/.external-pins/docker/scout-sbom-indexer___1/manifest-sha256_9fd5a33e6351eb52299c52e8e2294a331ab4fb4934984abc11508499617862cc-config.json
+++ b/.external-pins/docker/scout-sbom-indexer___1/manifest-sha256_12b2a5d0ce712fc7c8983abb99d0a649b02707f968575964f862c682884e7d8f-config.json
@@ -10,44 +10,44 @@
 		],
 		"Labels": {
 			"com.docker.image.source.entrypoint": "Dockerfile",
-			"org.opencontainers.image.created": "2024-02-02T15:20:24.018Z",
+			"org.opencontainers.image.created": "2024-02-16T10:36:10.568Z",
 			"org.opencontainers.image.description": "Docker Scout CLI Plugin",
 			"org.opencontainers.image.licenses": "",
-			"org.opencontainers.image.revision": "8f8fca49ab253bee1898098cdba37d9362a1ad1d",
+			"org.opencontainers.image.revision": "5661a7fce57851c49627a79c9d181e87833df7e8",
 			"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.4.1"
+			"org.opencontainers.image.version": "1.5.0"
 		},
 		"OnBuild": null,
 		"WorkingDir": "/"
 	},
-	"created": "2024-02-02T15:36:48.912579146Z",
+	"created": "2024-02-16T10:52:21.214473578Z",
 	"history": [
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-02-02T15:20:34.38089733Z",
+			"created": "2024-02-16T10:36:36.431682828Z",
 			"created_by": "COPY /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ # buildkit"
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-02-02T15:36:48.850860062Z",
+			"created": "2024-02-16T10:52:21.197750051Z",
 			"created_by": "COPY /go/src/dist/sbom-indexer /sbom-indexer # buildkit"
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-02-02T15:36:48.912579146Z",
+			"created": "2024-02-16T10:52:21.214473578Z",
 			"created_by": "COPY .vex/* /var/lib/db/vex/ # buildkit"
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-02-02T15:36:48.912579146Z",
+			"created": "2024-02-16T10:52:21.214473578Z",
 			"created_by": "ENV COLORTERM=true",
 			"empty_layer": true
 		},
 		{
 			"comment": "buildkit.dockerfile.v0",
-			"created": "2024-02-02T15:36:48.912579146Z",
+			"created": "2024-02-16T10:52:21.214473578Z",
 			"created_by": "ENTRYPOINT [\"/sbom-indexer\"]",
 			"empty_layer": true
 		}
@@ -55,9 +55,9 @@
 	"os": "linux",
 	"rootfs": {
 		"diff_ids": [
-			"sha256:e2780970efe0ea5006a7ceb06be73c7b7236767d848ee7013b0c2b492a711f37",
-			"sha256:3298ad60eb56cef93ef1cd7d281713cfb4a30d34122e8d62cb28b23050ab942c",
-			"sha256:c9384f2e1276ac4fc8815ddbe54a41f86a5cc4379e6c329e38df3301d52894ff"
+			"sha256:8e677b3560d31735c2ebc3276b0528a7a4d15d0bc23b7532eb3b3b30a47e9991",
+			"sha256:a853dcab69dc27d0dfc6ab6a1033f1116f3dbca9494275fd8e22ce46242bb226",
+			"sha256:11eb811da59e8b4d7140ee76783cb64eb586b8f11f416df436a0ec047ec8787a"
 		],
 		"type": "layers"
 	}
diff --git a/.external-pins/docker/scout-sbom-indexer___1/manifest-sha256_9fd5a33e6351eb52299c52e8e2294a331ab4fb4934984abc11508499617862cc.json b/.external-pins/docker/scout-sbom-indexer___1/manifest-sha256_12b2a5d0ce712fc7c8983abb99d0a649b02707f968575964f862c682884e7d8f.json
similarity index 50%
rename from .external-pins/docker/scout-sbom-indexer___1/manifest-sha256_9fd5a33e6351eb52299c52e8e2294a331ab4fb4934984abc11508499617862cc.json
rename to .external-pins/docker/scout-sbom-indexer___1/manifest-sha256_12b2a5d0ce712fc7c8983abb99d0a649b02707f968575964f862c682884e7d8f.json
index 59c9214..1b0f297 100644
--- a/.external-pins/docker/scout-sbom-indexer___1/manifest-sha256_9fd5a33e6351eb52299c52e8e2294a331ab4fb4934984abc11508499617862cc.json
+++ b/.external-pins/docker/scout-sbom-indexer___1/manifest-sha256_12b2a5d0ce712fc7c8983abb99d0a649b02707f968575964f862c682884e7d8f.json
@@ -1,24 +1,24 @@
 {
 	"config": {
-		"digest": "sha256:58fb35ab71e25e71da67d38175bef7903c9d43d443d44de20e790547f97cd7ff",
+		"digest": "sha256:990b064506f01719a47279df6eb584e078d3b3f5d0d17883686c545f7e2b0a2e",
 		"mediaType": "application/vnd.oci.image.config.v1+json",
-		"size": 1802
+		"size": 1803
 	},
 	"layers": [
 		{
-			"digest": "sha256:3b43e88819526d6fb75d8a7841f65635dae1f5e55fa3c86300931fd6eaccbe80",
+			"digest": "sha256:98b92ea1390d7803571b717a4a8b07deabf734b8b4c04b6dbea5b045ccff6168",
 			"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
 			"size": 123562
 		},
 		{
-			"digest": "sha256:dd8b6c8035e54c36fed0f9555cb34032eb8f889e01e1f20ec42b462fd18d7b51",
+			"digest": "sha256:63dbc9cb44d7c8e257577bb252702a9271b70bb12984e472777cae9c0110192a",
 			"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
-			"size": 18608108
+			"size": 18777733
 		},
 		{
-			"digest": "sha256:89836becc7487aa4799b6976b25fd929b47248856b38bf2a4a0e09f490f6cb59",
+			"digest": "sha256:9fb6de498c728dd8546945a071841e70c4fad633c24d2e459d3fefcaa80d8c40",
 			"mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
-			"size": 596
+			"size": 598
 		}
 	],
 	"mediaType": "application/vnd.oci.image.manifest.v1+json",

@LaurentGoderre
Copy link
Member

which tag does that point to?

@yosifkit
Copy link
Member

Looks to be 1.5.0.

@LaurentGoderre
Copy link
Member

Yep, looks good to go.

@LaurentGoderre
Copy link
Member

LGTM

@yosifkit yosifkit merged commit 3f790ef into docker-library:master Feb 16, 2024
6 checks passed
@yosifkit yosifkit deleted the external-pins-docker branch February 16, 2024 19:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants