Skip to content
Open
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 @@ -101,7 +101,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:1cc2a29f39af74ad432a283ee466dd43130dd9292e49f18baaaa3d890a857347"
want := "sha256:209d938840c9ecea442fc15db054aec5e6677c13393f7389e0069913151536f6"
require.Equal(t, want, digest.String())

// Check that the sbomPath is not empty.
Expand Down Expand Up @@ -177,7 +177,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:f5dc65ebea1afb5693ec323d6fdfa4b899a0c73af634d776a88bd44852d4216c"
want := "sha256:2c0fb0050fb586711d10d3d0b2b3858e02c45e6c894da5348cf7be87de3a4eb1"
require.Equal(t, want, digest.String())

im, err := idx.IndexManifest()
Expand Down

This file was deleted.

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:ca5e16c7c944d764863cb1a4286e668e72d6d87ef9ddd82337b19d87715bae7e"]},"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:c11431cd0f01e2f3046c0e43371e8c9abd2dcb2be0152e28484c1af133834bd3"]},"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:270f5467dc529c2edaa0d5173f0756da04eccfd12f53e1c5267e3231a4ffbe41"},"layers":[{"mediaType":"application/vnd.oci.image.layer.v1.tar+gzip","size":3085,"digest":"sha256:eb39d585629f6f13753cffa93714c16e45aa7c806cf4fa3662d4725d18425fad"}],"annotations":{"org.opencontainers.image.created":"1970-01-01T00:00:00Z","org.opencontainers.image.title":"Title","org.opencontainers.image.vendor":"Vendor"}}
Binary file not shown.

This file was deleted.

Binary file not shown.
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:20f698463c2755b6dc42b7d07e959ed7455a06e7367d507e829a315898f21a01"]},"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:b1499bfee6eb2f1f4ace628e58ee5dc91d9de4b1fb0e175266b4473e04030c93"]},"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:da5813653efaae5464c67846efcf135aabe7f053efc515434bc65b5d9891fc9c"},"layers":[{"mediaType":"application/vnd.oci.image.layer.v1.tar+gzip","size":3077,"digest":"sha256:36f58cd88d06783d4b3adb510e43d476a75b6985cc11e0bae09b7ddcf887c0ec"}],"annotations":{"org.opencontainers.image.created":"1970-01-01T00:00:00Z","org.opencontainers.image.title":"Title","org.opencontainers.image.vendor":"Vendor"}}
Binary file not shown.
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:69f0237c7f8cf0b8a329d1bf1d6870c870c4ec323e39d3a6da59596632d0f2f4","platform":{"architecture":"amd64","os":"linux"},"artifactType":"application/vnd.oci.image.config.v1+json"},{"mediaType":"application/vnd.oci.image.manifest.v1+json","size":560,"digest":"sha256:124c885f834cfaf1329987457a9651a68c4fb9733d4462ae6288b98011277858","platform":{"architecture":"arm64","os":"linux"},"artifactType":"application/vnd.oci.image.config.v1+json"}],"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:ea8cf97bc59cac73cfb94539c5c59a6b651f44fc083ae91b4cca8586b7374e58","platform":{"architecture":"amd64","os":"linux"},"artifactType":"application/vnd.oci.image.config.v1+json"},{"mediaType":"application/vnd.oci.image.manifest.v1+json","size":560,"digest":"sha256:32e7835adc3cd8ed7a86746e971100e996fa8bca0fb4482c26911ee00cbfd640","platform":{"architecture":"arm64","os":"linux"},"artifactType":"application/vnd.oci.image.config.v1+json"}],"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:7e0f9d62f6cab4785e18a55f17d03f20ffb776881f1f46258efd9458f7cdaf08",
"name": "sbom-sha256:eb39d585629f6f13753cffa93714c16e45aa7c806cf4fa3662d4725d18425fad",
"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-Image-sha256-124c885f834cfaf1329987457a9651a68c4fb9733d4462ae6288b98011277858"
"SPDXRef-Package-Image-sha256-32e7835adc3cd8ed7a86746e971100e996fa8bca0fb4482c26911ee00cbfd640"
],
"packages": [
{
"SPDXID": "SPDXRef-Package-Image-sha256-124c885f834cfaf1329987457a9651a68c4fb9733d4462ae6288b98011277858",
"name": "sha256:124c885f834cfaf1329987457a9651a68c4fb9733d4462ae6288b98011277858",
"versionInfo": "sha256:124c885f834cfaf1329987457a9651a68c4fb9733d4462ae6288b98011277858",
"SPDXID": "SPDXRef-Package-Image-sha256-32e7835adc3cd8ed7a86746e971100e996fa8bca0fb4482c26911ee00cbfd640",
"name": "sha256:32e7835adc3cd8ed7a86746e971100e996fa8bca0fb4482c26911ee00cbfd640",
"versionInfo": "sha256:32e7835adc3cd8ed7a86746e971100e996fa8bca0fb4482c26911ee00cbfd640",
"filesAnalyzed": false,
"description": "apko container image",
"downloadLocation": "NOASSERTION",
Expand All @@ -28,20 +28,20 @@
"checksums": [
{
"algorithm": "SHA256",
"checksumValue": "124c885f834cfaf1329987457a9651a68c4fb9733d4462ae6288b98011277858"
"checksumValue": "32e7835adc3cd8ed7a86746e971100e996fa8bca0fb4482c26911ee00cbfd640"
}
],
"externalRefs": [
{
"referenceCategory": "PACKAGE-MANAGER",
"referenceLocator": "pkg:oci/golden@sha256:124c885f834cfaf1329987457a9651a68c4fb9733d4462ae6288b98011277858?arch=arm64\u0026mediaType=application%2Fvnd.oci.image.manifest.v1%2Bjson\u0026os=linux",
"referenceLocator": "pkg:oci/golden@sha256:32e7835adc3cd8ed7a86746e971100e996fa8bca0fb4482c26911ee00cbfd640?arch=arm64\u0026mediaType=application%2Fvnd.oci.image.manifest.v1%2Bjson\u0026os=linux",
"referenceType": "purl"
}
]
},
{
"SPDXID": "SPDXRef-Package-ImageLayer-sha256-7e0f9d62f6cab4785e18a55f17d03f20ffb776881f1f46258efd9458f7cdaf08",
"name": "sha256:7e0f9d62f6cab4785e18a55f17d03f20ffb776881f1f46258efd9458f7cdaf08",
"SPDXID": "SPDXRef-Package-ImageLayer-sha256-eb39d585629f6f13753cffa93714c16e45aa7c806cf4fa3662d4725d18425fad",
"name": "sha256:eb39d585629f6f13753cffa93714c16e45aa7c806cf4fa3662d4725d18425fad",
"versionInfo": "1.0.0",
"filesAnalyzed": false,
"description": "apko operating system layer",
Expand All @@ -51,7 +51,7 @@
"externalRefs": [
{
"referenceCategory": "PACKAGE-MANAGER",
"referenceLocator": "pkg:oci/golden@sha256:7e0f9d62f6cab4785e18a55f17d03f20ffb776881f1f46258efd9458f7cdaf08?arch=arm64\u0026mediaType=application%2Fvnd.oci.image.layer.v1.tar%2Bgzip\u0026os=linux",
"referenceLocator": "pkg:oci/golden@sha256:eb39d585629f6f13753cffa93714c16e45aa7c806cf4fa3662d4725d18425fad?arch=arm64\u0026mediaType=application%2Fvnd.oci.image.layer.v1.tar%2Bgzip\u0026os=linux",
"referenceType": "purl"
}
]
Expand Down Expand Up @@ -147,17 +147,17 @@
],
"relationships": [
{
"spdxElementId": "SPDXRef-Package-Image-sha256-124c885f834cfaf1329987457a9651a68c4fb9733d4462ae6288b98011277858",
"spdxElementId": "SPDXRef-Package-Image-sha256-32e7835adc3cd8ed7a86746e971100e996fa8bca0fb4482c26911ee00cbfd640",
"relationshipType": "CONTAINS",
"relatedSpdxElement": "SPDXRef-Package-ImageLayer-sha256-7e0f9d62f6cab4785e18a55f17d03f20ffb776881f1f46258efd9458f7cdaf08"
"relatedSpdxElement": "SPDXRef-Package-ImageLayer-sha256-eb39d585629f6f13753cffa93714c16e45aa7c806cf4fa3662d4725d18425fad"
},
{
"spdxElementId": "SPDXRef-Package-apk-pretend-baselayout-1.0.0-r0",
"relationshipType": "DESCRIBED_BY",
"relatedSpdxElement": "SPDXRef-Package-Melange-pretend-baselayout.melange.yaml-326e0ed687bdfeadac839dc9b25686e4442c9d04"
},
{
"spdxElementId": "SPDXRef-Package-Image-sha256-124c885f834cfaf1329987457a9651a68c4fb9733d4462ae6288b98011277858",
"spdxElementId": "SPDXRef-Package-Image-sha256-32e7835adc3cd8ed7a86746e971100e996fa8bca0fb4482c26911ee00cbfd640",
"relationshipType": "CONTAINS",
"relatedSpdxElement": "SPDXRef-Package-apk-pretend-baselayout-1.0.0-r0"
},
Expand All @@ -167,7 +167,7 @@
"relatedSpdxElement": "SPDXRef-Package-Melange-replayout.melange.yaml-326e0ed687bdfeadac839dc9b25686e4442c9d04"
},
{
"spdxElementId": "SPDXRef-Package-Image-sha256-124c885f834cfaf1329987457a9651a68c4fb9733d4462ae6288b98011277858",
"spdxElementId": "SPDXRef-Package-Image-sha256-32e7835adc3cd8ed7a86746e971100e996fa8bca0fb4482c26911ee00cbfd640",
"relationshipType": "CONTAINS",
"relatedSpdxElement": "SPDXRef-Package-apk-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:b5f05e6fc882c97d61c1daee566954ae6fc09924f8e152293e2b97a06092069f",
"name": "sbom-sha256:1edfc6aaee9fbd0abaa5ee6a44a869955815ddc08b04a202454437b4a0654413",
"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-b5f05e6fc882c97d61c1daee566954ae6fc09924f8e152293e2b97a06092069f"
"SPDXRef-Package-sha256-1edfc6aaee9fbd0abaa5ee6a44a869955815ddc08b04a202454437b4a0654413"
],
"packages": [
{
"SPDXID": "SPDXRef-Package-sha256-b5f05e6fc882c97d61c1daee566954ae6fc09924f8e152293e2b97a06092069f",
"name": "sha256:b5f05e6fc882c97d61c1daee566954ae6fc09924f8e152293e2b97a06092069f",
"versionInfo": "sha256:b5f05e6fc882c97d61c1daee566954ae6fc09924f8e152293e2b97a06092069f",
"SPDXID": "SPDXRef-Package-sha256-1edfc6aaee9fbd0abaa5ee6a44a869955815ddc08b04a202454437b4a0654413",
"name": "sha256:1edfc6aaee9fbd0abaa5ee6a44a869955815ddc08b04a202454437b4a0654413",
"versionInfo": "sha256:1edfc6aaee9fbd0abaa5ee6a44a869955815ddc08b04a202454437b4a0654413",
"filesAnalyzed": false,
"description": "Multi-arch image index",
"downloadLocation": "NOASSERTION",
Expand All @@ -29,72 +29,72 @@
"checksums": [
{
"algorithm": "SHA256",
"checksumValue": "b5f05e6fc882c97d61c1daee566954ae6fc09924f8e152293e2b97a06092069f"
"checksumValue": "1edfc6aaee9fbd0abaa5ee6a44a869955815ddc08b04a202454437b4a0654413"
}
],
"externalRefs": [
{
"referenceCategory": "PACKAGE-MANAGER",
"referenceLocator": "pkg:oci/golden@sha256:b5f05e6fc882c97d61c1daee566954ae6fc09924f8e152293e2b97a06092069f?mediaType=application%2Fvnd.oci.image.index.v1%2Bjson",
"referenceLocator": "pkg:oci/golden@sha256:1edfc6aaee9fbd0abaa5ee6a44a869955815ddc08b04a202454437b4a0654413?mediaType=application%2Fvnd.oci.image.index.v1%2Bjson",
"referenceType": "purl"
}
]
},
{
"SPDXID": "SPDXRef-Package-sha256-69f0237c7f8cf0b8a329d1bf1d6870c870c4ec323e39d3a6da59596632d0f2f4",
"name": "sha256:69f0237c7f8cf0b8a329d1bf1d6870c870c4ec323e39d3a6da59596632d0f2f4",
"versionInfo": "sha256:69f0237c7f8cf0b8a329d1bf1d6870c870c4ec323e39d3a6da59596632d0f2f4",
"SPDXID": "SPDXRef-Package-sha256-ea8cf97bc59cac73cfb94539c5c59a6b651f44fc083ae91b4cca8586b7374e58",
"name": "sha256:ea8cf97bc59cac73cfb94539c5c59a6b651f44fc083ae91b4cca8586b7374e58",
"versionInfo": "sha256:ea8cf97bc59cac73cfb94539c5c59a6b651f44fc083ae91b4cca8586b7374e58",
"filesAnalyzed": false,
"downloadLocation": "NOASSERTION",
"supplier": "Organization: Chainguard, Inc.",
"primaryPackagePurpose": "CONTAINER",
"checksums": [
{
"algorithm": "SHA256",
"checksumValue": "69f0237c7f8cf0b8a329d1bf1d6870c870c4ec323e39d3a6da59596632d0f2f4"
"checksumValue": "ea8cf97bc59cac73cfb94539c5c59a6b651f44fc083ae91b4cca8586b7374e58"
}
],
"externalRefs": [
{
"referenceCategory": "PACKAGE-MANAGER",
"referenceLocator": "pkg:oci/golden@sha256:69f0237c7f8cf0b8a329d1bf1d6870c870c4ec323e39d3a6da59596632d0f2f4?arch=amd64\u0026mediaType=application%2Fvnd.oci.image.manifest.v1%2Bjson\u0026os=linux",
"referenceLocator": "pkg:oci/golden@sha256:ea8cf97bc59cac73cfb94539c5c59a6b651f44fc083ae91b4cca8586b7374e58?arch=amd64\u0026mediaType=application%2Fvnd.oci.image.manifest.v1%2Bjson\u0026os=linux",
"referenceType": "purl"
}
]
},
{
"SPDXID": "SPDXRef-Package-sha256-124c885f834cfaf1329987457a9651a68c4fb9733d4462ae6288b98011277858",
"name": "sha256:124c885f834cfaf1329987457a9651a68c4fb9733d4462ae6288b98011277858",
"versionInfo": "sha256:124c885f834cfaf1329987457a9651a68c4fb9733d4462ae6288b98011277858",
"SPDXID": "SPDXRef-Package-sha256-32e7835adc3cd8ed7a86746e971100e996fa8bca0fb4482c26911ee00cbfd640",
"name": "sha256:32e7835adc3cd8ed7a86746e971100e996fa8bca0fb4482c26911ee00cbfd640",
"versionInfo": "sha256:32e7835adc3cd8ed7a86746e971100e996fa8bca0fb4482c26911ee00cbfd640",
"filesAnalyzed": false,
"downloadLocation": "NOASSERTION",
"supplier": "Organization: Chainguard, Inc.",
"primaryPackagePurpose": "CONTAINER",
"checksums": [
{
"algorithm": "SHA256",
"checksumValue": "124c885f834cfaf1329987457a9651a68c4fb9733d4462ae6288b98011277858"
"checksumValue": "32e7835adc3cd8ed7a86746e971100e996fa8bca0fb4482c26911ee00cbfd640"
}
],
"externalRefs": [
{
"referenceCategory": "PACKAGE-MANAGER",
"referenceLocator": "pkg:oci/golden@sha256:124c885f834cfaf1329987457a9651a68c4fb9733d4462ae6288b98011277858?arch=arm64\u0026mediaType=application%2Fvnd.oci.image.manifest.v1%2Bjson\u0026os=linux",
"referenceLocator": "pkg:oci/golden@sha256:32e7835adc3cd8ed7a86746e971100e996fa8bca0fb4482c26911ee00cbfd640?arch=arm64\u0026mediaType=application%2Fvnd.oci.image.manifest.v1%2Bjson\u0026os=linux",
"referenceType": "purl"
}
]
}
],
"relationships": [
{
"spdxElementId": "SPDXRef-Package-sha256-b5f05e6fc882c97d61c1daee566954ae6fc09924f8e152293e2b97a06092069f",
"spdxElementId": "SPDXRef-Package-sha256-1edfc6aaee9fbd0abaa5ee6a44a869955815ddc08b04a202454437b4a0654413",
"relationshipType": "VARIANT_OF",
"relatedSpdxElement": "SPDXRef-Package-sha256-69f0237c7f8cf0b8a329d1bf1d6870c870c4ec323e39d3a6da59596632d0f2f4"
"relatedSpdxElement": "SPDXRef-Package-sha256-ea8cf97bc59cac73cfb94539c5c59a6b651f44fc083ae91b4cca8586b7374e58"
},
{
"spdxElementId": "SPDXRef-Package-sha256-b5f05e6fc882c97d61c1daee566954ae6fc09924f8e152293e2b97a06092069f",
"spdxElementId": "SPDXRef-Package-sha256-1edfc6aaee9fbd0abaa5ee6a44a869955815ddc08b04a202454437b4a0654413",
"relationshipType": "VARIANT_OF",
"relatedSpdxElement": "SPDXRef-Package-sha256-124c885f834cfaf1329987457a9651a68c4fb9733d4462ae6288b98011277858"
"relatedSpdxElement": "SPDXRef-Package-sha256-32e7835adc3cd8ed7a86746e971100e996fa8bca0fb4482c26911ee00cbfd640"
}
]
}
Loading