Skip to content
Draft
Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions internal/cli/publish_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ func TestPublish(t *testing.T) {

// This test will fail if we ever make a change in apko that changes the image.
// Sometimes, this is intentional, and we need to change this and bump the version.
want := "sha256:91213f5088cd9e4e0b8daa74f86085c7007c5896ade6ef0ef9bcbcdda16f5f2d"
want := "sha256:c4e7dfb4c3c21de018fc9a8a5451fe0cbe4980a88e87c6da05fd533d69c699cc"
require.Equal(t, want, digest.String())

// Check that the sbomPath is not empty.
Expand Down Expand Up @@ -174,7 +174,7 @@ func TestPublishLayering(t *testing.T) {

// This test will fail if we ever make a change in apko that changes the image.
// Sometimes, this is intentional, and we need to change this and bump the version.
want := "sha256:72435e8671ef7d79007d93066b54c81b875e567ccd396945d7b9ec083f96cba0"
want := "sha256:1d3de8a1982d1268ab9e380cea42de5d11f2fd29aa853e067f842fb00881eb74"
require.Equal(t, want, digest.String())

im, err := idx.IndexManifest()
Expand Down
Binary file not shown.

This file was deleted.

This file was deleted.

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"architecture":"amd64","author":"github.com/chainguard-dev/apko","created":"1970-01-01T00:00:00Z","history":[{"author":"apko","created":"1970-01-01T00:00:00Z","created_by":"apko","comment":"Title by Vendor"}],"os":"linux","rootfs":{"type":"layers","diff_ids":["sha256:5f11680e484ee94fedf9e105f1411d174e7a15185c3d976d1f7ce028e07bf26c"]},"config":{"Entrypoint":["/bin/sh","-l"],"Env":["PATH=/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin","SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt"],"Labels":{"org.opencontainers.image.created":"1970-01-01T00:00:00Z","org.opencontainers.image.title":"Title","org.opencontainers.image.vendor":"Vendor"}}}
{"architecture":"amd64","author":"github.com/chainguard-dev/apko","created":"1970-01-01T00:00:00Z","history":[{"author":"apko","created":"1970-01-01T00:00:00Z","created_by":"apko","comment":"Title by Vendor"}],"os":"linux","rootfs":{"type":"layers","diff_ids":["sha256:e0b6fd59bae2c2fdfd4b6d8854ada71c5cd19a7a737f93f74d53577f7037c5f8"]},"config":{"Entrypoint":["/bin/sh","-l"],"Env":["PATH=/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin","SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt"],"Labels":{"org.opencontainers.image.created":"1970-01-01T00:00:00Z","org.opencontainers.image.title":"Title","org.opencontainers.image.vendor":"Vendor"}}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"schemaVersion":2,"mediaType":"application/vnd.oci.image.manifest.v1+json","config":{"mediaType":"application/vnd.oci.image.config.v1+json","size":658,"digest":"sha256:b9244786b8260ad3910cfc94a1c3b3efdec4b90d97d80c53727ceb0eb62755f8"},"layers":[{"mediaType":"application/vnd.oci.image.layer.v1.tar+gzip","size":3043,"digest":"sha256:a25856cb2bced5b785f7da9940f51c8f5e2a3f08191782f78a63491d5876bc1a"}],"annotations":{"org.opencontainers.image.created":"1970-01-01T00:00:00Z","org.opencontainers.image.title":"Title","org.opencontainers.image.vendor":"Vendor"}}
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"architecture":"arm64","author":"github.com/chainguard-dev/apko","created":"1970-01-01T00:00:00Z","history":[{"author":"apko","created":"1970-01-01T00:00:00Z","created_by":"apko","comment":"Title by Vendor"}],"os":"linux","rootfs":{"type":"layers","diff_ids":["sha256:eb9640d19167d1e06f69bb57163e696ad254548869faddb5f14d34a933d22a72"]},"config":{"Entrypoint":["/bin/sh","-l"],"Env":["PATH=/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin","SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt"],"Labels":{"org.opencontainers.image.created":"1970-01-01T00:00:00Z","org.opencontainers.image.title":"Title","org.opencontainers.image.vendor":"Vendor"}}}
{"architecture":"arm64","author":"github.com/chainguard-dev/apko","created":"1970-01-01T00:00:00Z","history":[{"author":"apko","created":"1970-01-01T00:00:00Z","created_by":"apko","comment":"Title by Vendor"}],"os":"linux","rootfs":{"type":"layers","diff_ids":["sha256:5451faf766e755d504df0157f14be8aa8a8b3f22bdfe6d24773a54efb1331982"]},"config":{"Entrypoint":["/bin/sh","-l"],"Env":["PATH=/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin","SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt"],"Labels":{"org.opencontainers.image.created":"1970-01-01T00:00:00Z","org.opencontainers.image.title":"Title","org.opencontainers.image.vendor":"Vendor"}}}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"schemaVersion":2,"mediaType":"application/vnd.oci.image.manifest.v1+json","config":{"mediaType":"application/vnd.oci.image.config.v1+json","size":658,"digest":"sha256:7307927b61de0847437230ef075582118de9e7caa4c782f9c120b7937f25e791"},"layers":[{"mediaType":"application/vnd.oci.image.layer.v1.tar+gzip","size":3035,"digest":"sha256:1cff97402ea9049bf07df7a07423842bf3b66eae4baf0dd1bcf83559df51d1f8"}],"annotations":{"org.opencontainers.image.created":"1970-01-01T00:00:00Z","org.opencontainers.image.title":"Title","org.opencontainers.image.vendor":"Vendor"}}
2 changes: 1 addition & 1 deletion internal/cli/testdata/golden/index.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"schemaVersion":2,"mediaType":"application/vnd.oci.image.index.v1+json","manifests":[{"mediaType":"application/vnd.oci.image.manifest.v1+json","size":560,"digest":"sha256:3fa87a64fb699f65953caad1adcba9f5d3f25134bfff43f92a1ed097712cd79a","platform":{"architecture":"amd64","os":"linux"}},{"mediaType":"application/vnd.oci.image.manifest.v1+json","size":560,"digest":"sha256:462b8caeb0369dd5ec14eb4f698cddd327f26ba65720561497217ffad2e96d6a","platform":{"architecture":"arm64","os":"linux"}}],"annotations":{"org.opencontainers.image.created":"1970-01-01T00:00:00Z","org.opencontainers.image.title":"Title","org.opencontainers.image.vendor":"Vendor"}}
{"schemaVersion":2,"mediaType":"application/vnd.oci.image.index.v1+json","manifests":[{"mediaType":"application/vnd.oci.image.manifest.v1+json","size":560,"digest":"sha256:f3836dac093d9f23c3b09a5e0f369460e3ab4542c978caa8dec2910b49a71a67","platform":{"architecture":"amd64","os":"linux"}},{"mediaType":"application/vnd.oci.image.manifest.v1+json","size":560,"digest":"sha256:846eb895d52f3302d0cf96b53d6129058d4d070e079f177262c1ceef92561249","platform":{"architecture":"arm64","os":"linux"}}],"annotations":{"org.opencontainers.image.created":"1970-01-01T00:00:00Z","org.opencontainers.image.title":"Title","org.opencontainers.image.vendor":"Vendor"}}
28 changes: 14 additions & 14 deletions internal/cli/testdata/golden/sboms/sbom-aarch64.spdx.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"SPDXID": "SPDXRef-DOCUMENT",
"name": "sbom-sha256:b075b4a14ed0c1e236bac3448fa494c77772feb140cfad4033450e45010da27f",
"name": "sbom-sha256:a25856cb2bced5b785f7da9940f51c8f5e2a3f08191782f78a63491d5876bc1a",
"spdxVersion": "SPDX-2.3",
"creationInfo": {
"created": "1970-01-01T00:00:00Z",
Expand All @@ -13,13 +13,13 @@
"dataLicense": "CC0-1.0",
"documentNamespace": "https://spdx.org/spdxdocs/apko/",
"documentDescribes": [
"SPDXRef-Package-sha256-462b8caeb0369dd5ec14eb4f698cddd327f26ba65720561497217ffad2e96d6a"
"SPDXRef-Package-sha256-846eb895d52f3302d0cf96b53d6129058d4d070e079f177262c1ceef92561249"
],
"packages": [
{
"SPDXID": "SPDXRef-Package-sha256-462b8caeb0369dd5ec14eb4f698cddd327f26ba65720561497217ffad2e96d6a",
"name": "sha256:462b8caeb0369dd5ec14eb4f698cddd327f26ba65720561497217ffad2e96d6a",
"versionInfo": "sha256:462b8caeb0369dd5ec14eb4f698cddd327f26ba65720561497217ffad2e96d6a",
"SPDXID": "SPDXRef-Package-sha256-846eb895d52f3302d0cf96b53d6129058d4d070e079f177262c1ceef92561249",
"name": "sha256:846eb895d52f3302d0cf96b53d6129058d4d070e079f177262c1ceef92561249",
"versionInfo": "sha256:846eb895d52f3302d0cf96b53d6129058d4d070e079f177262c1ceef92561249",
"filesAnalyzed": false,
"description": "apko container image",
"downloadLocation": "NOASSERTION",
Expand All @@ -28,20 +28,20 @@
"checksums": [
{
"algorithm": "SHA256",
"checksumValue": "462b8caeb0369dd5ec14eb4f698cddd327f26ba65720561497217ffad2e96d6a"
"checksumValue": "846eb895d52f3302d0cf96b53d6129058d4d070e079f177262c1ceef92561249"
}
],
"externalRefs": [
{
"referenceCategory": "PACKAGE-MANAGER",
"referenceLocator": "pkg:oci/golden@sha256%3A462b8caeb0369dd5ec14eb4f698cddd327f26ba65720561497217ffad2e96d6a?arch=arm64\u0026mediaType=application%2Fvnd.oci.image.manifest.v1%2Bjson\u0026os=linux",
"referenceLocator": "pkg:oci/golden@sha256%3A846eb895d52f3302d0cf96b53d6129058d4d070e079f177262c1ceef92561249?arch=arm64\u0026mediaType=application%2Fvnd.oci.image.manifest.v1%2Bjson\u0026os=linux",
"referenceType": "purl"
}
]
},
{
"SPDXID": "SPDXRef-Package-sha256-b075b4a14ed0c1e236bac3448fa494c77772feb140cfad4033450e45010da27f",
"name": "sha256:b075b4a14ed0c1e236bac3448fa494c77772feb140cfad4033450e45010da27f",
"SPDXID": "SPDXRef-Package-sha256-a25856cb2bced5b785f7da9940f51c8f5e2a3f08191782f78a63491d5876bc1a",
"name": "sha256:a25856cb2bced5b785f7da9940f51c8f5e2a3f08191782f78a63491d5876bc1a",
"versionInfo": "1.0.0",
"filesAnalyzed": false,
"description": "apko operating system layer",
Expand All @@ -50,7 +50,7 @@
"externalRefs": [
{
"referenceCategory": "PACKAGE-MANAGER",
"referenceLocator": "pkg:oci/golden@sha256%3Ab075b4a14ed0c1e236bac3448fa494c77772feb140cfad4033450e45010da27f?arch=arm64\u0026mediaType=application%2Fvnd.oci.image.layer.v1.tar%2Bgzip\u0026os=linux",
"referenceLocator": "pkg:oci/golden@sha256%3Aa25856cb2bced5b785f7da9940f51c8f5e2a3f08191782f78a63491d5876bc1a?arch=arm64\u0026mediaType=application%2Fvnd.oci.image.layer.v1.tar%2Bgzip\u0026os=linux",
"referenceType": "purl"
}
]
Expand Down Expand Up @@ -142,17 +142,17 @@
],
"relationships": [
{
"spdxElementId": "SPDXRef-Package-sha256-462b8caeb0369dd5ec14eb4f698cddd327f26ba65720561497217ffad2e96d6a",
"spdxElementId": "SPDXRef-Package-sha256-846eb895d52f3302d0cf96b53d6129058d4d070e079f177262c1ceef92561249",
"relationshipType": "CONTAINS",
"relatedSpdxElement": "SPDXRef-Package-sha256-b075b4a14ed0c1e236bac3448fa494c77772feb140cfad4033450e45010da27f"
"relatedSpdxElement": "SPDXRef-Package-sha256-a25856cb2bced5b785f7da9940f51c8f5e2a3f08191782f78a63491d5876bc1a"
},
{
"spdxElementId": "SPDXRef-Package-pretend-baselayout-1.0.0-r0",
"relationshipType": "DESCRIBED_BY",
"relatedSpdxElement": "SPDXRef-Package-pretend-baselayout.melange.yaml-8e7230fc2d8afd47a5341ca0ba9b63f93bda5491"
},
{
"spdxElementId": "SPDXRef-Package-sha256-462b8caeb0369dd5ec14eb4f698cddd327f26ba65720561497217ffad2e96d6a",
"spdxElementId": "SPDXRef-Package-sha256-846eb895d52f3302d0cf96b53d6129058d4d070e079f177262c1ceef92561249",
"relationshipType": "CONTAINS",
"relatedSpdxElement": "SPDXRef-Package-pretend-baselayout-1.0.0-r0"
},
Expand All @@ -162,7 +162,7 @@
"relatedSpdxElement": "SPDXRef-Package-replayout.melange.yaml-8e7230fc2d8afd47a5341ca0ba9b63f93bda5491"
},
{
"spdxElementId": "SPDXRef-Package-sha256-462b8caeb0369dd5ec14eb4f698cddd327f26ba65720561497217ffad2e96d6a",
"spdxElementId": "SPDXRef-Package-sha256-846eb895d52f3302d0cf96b53d6129058d4d070e079f177262c1ceef92561249",
"relationshipType": "CONTAINS",
"relatedSpdxElement": "SPDXRef-Package-replayout-1.0.0-r0"
}
Expand Down
42 changes: 21 additions & 21 deletions internal/cli/testdata/golden/sboms/sbom-index.spdx.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"SPDXID": "SPDXRef-DOCUMENT",
"name": "sbom-sha256:dca012567a108b20ddbae2b1701530ce24b60d2dbe88ad8eb3c99422e2db99a2",
"name": "sbom-sha256:9c70a7cfd6d2dc33ab92cb48382af49815626cd416eb8a907c3bac6adeece9a7",
"spdxVersion": "SPDX-2.3",
"creationInfo": {
"created": "1970-01-01T00:00:00Z",
Expand All @@ -13,13 +13,13 @@
"dataLicense": "CC0-1.0",
"documentNamespace": "https://spdx.org/spdxdocs/apko/",
"documentDescribes": [
"SPDXRef-Package-sha256-dca012567a108b20ddbae2b1701530ce24b60d2dbe88ad8eb3c99422e2db99a2"
"SPDXRef-Package-sha256-9c70a7cfd6d2dc33ab92cb48382af49815626cd416eb8a907c3bac6adeece9a7"
],
"packages": [
{
"SPDXID": "SPDXRef-Package-sha256-dca012567a108b20ddbae2b1701530ce24b60d2dbe88ad8eb3c99422e2db99a2",
"name": "sha256:dca012567a108b20ddbae2b1701530ce24b60d2dbe88ad8eb3c99422e2db99a2",
"versionInfo": "sha256:dca012567a108b20ddbae2b1701530ce24b60d2dbe88ad8eb3c99422e2db99a2",
"SPDXID": "SPDXRef-Package-sha256-9c70a7cfd6d2dc33ab92cb48382af49815626cd416eb8a907c3bac6adeece9a7",
"name": "sha256:9c70a7cfd6d2dc33ab92cb48382af49815626cd416eb8a907c3bac6adeece9a7",
"versionInfo": "sha256:9c70a7cfd6d2dc33ab92cb48382af49815626cd416eb8a907c3bac6adeece9a7",
"filesAnalyzed": false,
"description": "Multi-arch image index",
"downloadLocation": "NOASSERTION",
Expand All @@ -29,72 +29,72 @@
"checksums": [
{
"algorithm": "SHA256",
"checksumValue": "dca012567a108b20ddbae2b1701530ce24b60d2dbe88ad8eb3c99422e2db99a2"
"checksumValue": "9c70a7cfd6d2dc33ab92cb48382af49815626cd416eb8a907c3bac6adeece9a7"
}
],
"externalRefs": [
{
"referenceCategory": "PACKAGE-MANAGER",
"referenceLocator": "pkg:oci/golden@sha256%3Adca012567a108b20ddbae2b1701530ce24b60d2dbe88ad8eb3c99422e2db99a2?mediaType=application%2Fvnd.oci.image.index.v1%2Bjson",
"referenceLocator": "pkg:oci/golden@sha256%3A9c70a7cfd6d2dc33ab92cb48382af49815626cd416eb8a907c3bac6adeece9a7?mediaType=application%2Fvnd.oci.image.index.v1%2Bjson",
"referenceType": "purl"
}
]
},
{
"SPDXID": "SPDXRef-Package-sha256-3fa87a64fb699f65953caad1adcba9f5d3f25134bfff43f92a1ed097712cd79a",
"name": "sha256:3fa87a64fb699f65953caad1adcba9f5d3f25134bfff43f92a1ed097712cd79a",
"versionInfo": "sha256:3fa87a64fb699f65953caad1adcba9f5d3f25134bfff43f92a1ed097712cd79a",
"SPDXID": "SPDXRef-Package-sha256-f3836dac093d9f23c3b09a5e0f369460e3ab4542c978caa8dec2910b49a71a67",
"name": "sha256:f3836dac093d9f23c3b09a5e0f369460e3ab4542c978caa8dec2910b49a71a67",
"versionInfo": "sha256:f3836dac093d9f23c3b09a5e0f369460e3ab4542c978caa8dec2910b49a71a67",
"filesAnalyzed": false,
"downloadLocation": "NOASSERTION",
"supplier": "Organization: Chainguard, Inc.",
"primaryPackagePurpose": "CONTAINER",
"checksums": [
{
"algorithm": "SHA256",
"checksumValue": "3fa87a64fb699f65953caad1adcba9f5d3f25134bfff43f92a1ed097712cd79a"
"checksumValue": "f3836dac093d9f23c3b09a5e0f369460e3ab4542c978caa8dec2910b49a71a67"
}
],
"externalRefs": [
{
"referenceCategory": "PACKAGE-MANAGER",
"referenceLocator": "pkg:oci/golden@sha256%3A3fa87a64fb699f65953caad1adcba9f5d3f25134bfff43f92a1ed097712cd79a?arch=amd64\u0026mediaType=application%2Fvnd.oci.image.manifest.v1%2Bjson\u0026os=linux",
"referenceLocator": "pkg:oci/golden@sha256%3Af3836dac093d9f23c3b09a5e0f369460e3ab4542c978caa8dec2910b49a71a67?arch=amd64\u0026mediaType=application%2Fvnd.oci.image.manifest.v1%2Bjson\u0026os=linux",
"referenceType": "purl"
}
]
},
{
"SPDXID": "SPDXRef-Package-sha256-462b8caeb0369dd5ec14eb4f698cddd327f26ba65720561497217ffad2e96d6a",
"name": "sha256:462b8caeb0369dd5ec14eb4f698cddd327f26ba65720561497217ffad2e96d6a",
"versionInfo": "sha256:462b8caeb0369dd5ec14eb4f698cddd327f26ba65720561497217ffad2e96d6a",
"SPDXID": "SPDXRef-Package-sha256-846eb895d52f3302d0cf96b53d6129058d4d070e079f177262c1ceef92561249",
"name": "sha256:846eb895d52f3302d0cf96b53d6129058d4d070e079f177262c1ceef92561249",
"versionInfo": "sha256:846eb895d52f3302d0cf96b53d6129058d4d070e079f177262c1ceef92561249",
"filesAnalyzed": false,
"downloadLocation": "NOASSERTION",
"supplier": "Organization: Chainguard, Inc.",
"primaryPackagePurpose": "CONTAINER",
"checksums": [
{
"algorithm": "SHA256",
"checksumValue": "462b8caeb0369dd5ec14eb4f698cddd327f26ba65720561497217ffad2e96d6a"
"checksumValue": "846eb895d52f3302d0cf96b53d6129058d4d070e079f177262c1ceef92561249"
}
],
"externalRefs": [
{
"referenceCategory": "PACKAGE-MANAGER",
"referenceLocator": "pkg:oci/golden@sha256%3A462b8caeb0369dd5ec14eb4f698cddd327f26ba65720561497217ffad2e96d6a?arch=arm64\u0026mediaType=application%2Fvnd.oci.image.manifest.v1%2Bjson\u0026os=linux",
"referenceLocator": "pkg:oci/golden@sha256%3A846eb895d52f3302d0cf96b53d6129058d4d070e079f177262c1ceef92561249?arch=arm64\u0026mediaType=application%2Fvnd.oci.image.manifest.v1%2Bjson\u0026os=linux",
"referenceType": "purl"
}
]
}
],
"relationships": [
{
"spdxElementId": "SPDXRef-Package-sha256-dca012567a108b20ddbae2b1701530ce24b60d2dbe88ad8eb3c99422e2db99a2",
"spdxElementId": "SPDXRef-Package-sha256-9c70a7cfd6d2dc33ab92cb48382af49815626cd416eb8a907c3bac6adeece9a7",
"relationshipType": "VARIANT_OF",
"relatedSpdxElement": "SPDXRef-Package-sha256-3fa87a64fb699f65953caad1adcba9f5d3f25134bfff43f92a1ed097712cd79a"
"relatedSpdxElement": "SPDXRef-Package-sha256-f3836dac093d9f23c3b09a5e0f369460e3ab4542c978caa8dec2910b49a71a67"
},
{
"spdxElementId": "SPDXRef-Package-sha256-dca012567a108b20ddbae2b1701530ce24b60d2dbe88ad8eb3c99422e2db99a2",
"spdxElementId": "SPDXRef-Package-sha256-9c70a7cfd6d2dc33ab92cb48382af49815626cd416eb8a907c3bac6adeece9a7",
"relationshipType": "VARIANT_OF",
"relatedSpdxElement": "SPDXRef-Package-sha256-462b8caeb0369dd5ec14eb4f698cddd327f26ba65720561497217ffad2e96d6a"
"relatedSpdxElement": "SPDXRef-Package-sha256-846eb895d52f3302d0cf96b53d6129058d4d070e079f177262c1ceef92561249"
}
]
}
Loading
Loading