From 61b07bfa83f8e5c0cea99208ac9781199c986fa6 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Sun, 21 Jan 2024 23:03:06 +0900 Subject: [PATCH] pkg/build/nodeimage: update manifest.json schema for Docker v25 Signed-off-by: Akihiro Suda --- go.mod | 2 ++ go.sum | 4 ++++ pkg/build/nodeimage/internal/container/docker/archive.go | 9 ++++++--- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 95f499bd75..2823c9c457 100644 --- a/go.mod +++ b/go.mod @@ -8,6 +8,8 @@ require ( github.com/evanphx/json-patch/v5 v5.6.0 github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 github.com/mattn/go-isatty v0.0.14 + github.com/opencontainers/go-digest v1.0.0 + github.com/opencontainers/image-spec v1.0.2 github.com/pelletier/go-toml v1.9.4 github.com/pkg/errors v0.9.1 github.com/spf13/cobra v1.4.0 diff --git a/go.sum b/go.sum index 863b64ef57..97d2b66984 100644 --- a/go.sum +++ b/go.sum @@ -19,6 +19,10 @@ github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= +github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= +github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM= +github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= diff --git a/pkg/build/nodeimage/internal/container/docker/archive.go b/pkg/build/nodeimage/internal/container/docker/archive.go index 66d163f89c..ebdc8fc2cd 100644 --- a/pkg/build/nodeimage/internal/container/docker/archive.go +++ b/pkg/build/nodeimage/internal/container/docker/archive.go @@ -26,6 +26,8 @@ import ( "os" "strings" + "github.com/opencontainers/go-digest" + ocispec "github.com/opencontainers/image-spec/specs-go/v1" "sigs.k8s.io/kind/pkg/errors" ) @@ -185,9 +187,10 @@ func editRepositoriesFile(raw []byte, editRepositories func(string) string) ([]b // https://github.com/moby/moby/blob/master/image/spec/v1.2.md#combined-image-json--filesystem-changeset-format type metadataEntry struct { - Config string `json:"Config"` - RepoTags []string `json:"RepoTags"` - Layers []string `json:"Layers"` + Config string `json:"Config"` + RepoTags []string `json:"RepoTags"` + Layers []string `json:"Layers"` + LayerSources map[digest.Digest]ocispec.Descriptor `json:"LayerSources,omitempty"` // since Docker v25 } // applies