diff --git a/vendor/github.com/containers/image/copy/copy.go b/vendor/github.com/containers/image/copy/copy.go index 4656fca5..a8673c01 100644 --- a/vendor/github.com/containers/image/copy/copy.go +++ b/vendor/github.com/containers/image/copy/copy.go @@ -212,14 +212,14 @@ func copyLayers(manifestUpdates *types.ManifestUpdateOptions, dest types.ImageDe canModifyManifest bool, reportWriter io.Writer) error { type copiedLayer struct { blobInfo types.BlobInfo - diffID string + diffID digest.Digest } diffIDsAreNeeded := src.UpdatedImageNeedsLayerDiffIDs(*manifestUpdates) srcInfos := src.LayerInfos() destInfos := []types.BlobInfo{} - diffIDs := []string{} + diffIDs := []digest.Digest{} copiedLayers := map[digest.Digest]copiedLayer{} for _, srcLayer := range srcInfos { cl, ok := copiedLayers[srcLayer.Digest] @@ -229,7 +229,7 @@ func copyLayers(manifestUpdates *types.ManifestUpdateOptions, dest types.ImageDe if err != nil { return err } - cl = copiedLayer{blobInfo: destInfo, diffID: diffID.String()} + cl = copiedLayer{blobInfo: destInfo, diffID: diffID} copiedLayers[srcLayer.Digest] = cl } destInfos = append(destInfos, cl.blobInfo) diff --git a/vendor/github.com/containers/image/docker/daemon/daemon_types.go b/vendor/github.com/containers/image/docker/daemon/daemon_types.go index 0f933ed6..c1bb9caa 100644 --- a/vendor/github.com/containers/image/docker/daemon/daemon_types.go +++ b/vendor/github.com/containers/image/docker/daemon/daemon_types.go @@ -22,7 +22,7 @@ type manifestItem struct { } type imageID string -type diffID string +type diffID digest.Digest // Based on github.com/docker/distribution/blobs.go type distributionDescriptor struct { diff --git a/vendor/github.com/containers/image/image/docker_schema1.go b/vendor/github.com/containers/image/image/docker_schema1.go index c0f2f467..587ea50f 100644 --- a/vendor/github.com/containers/image/image/docker_schema1.go +++ b/vendor/github.com/containers/image/image/docker_schema1.go @@ -236,7 +236,7 @@ func validateV1ID(id string) error { } // Based on github.com/docker/docker/distribution/pull_v2.go -func (m *manifestSchema1) convertToManifestSchema2(uploadedLayerInfos []types.BlobInfo, layerDiffIDs []string) (types.Image, error) { +func (m *manifestSchema1) convertToManifestSchema2(uploadedLayerInfos []types.BlobInfo, layerDiffIDs []digest.Digest) (types.Image, error) { if len(m.History) == 0 { // What would this even mean?! Anyhow, the rest of the code depends on fsLayers[0] and history[0] existing. return nil, fmt.Errorf("Cannot convert an image with 0 history entries to %s", manifest.DockerV2Schema2MediaType) @@ -253,7 +253,7 @@ func (m *manifestSchema1) convertToManifestSchema2(uploadedLayerInfos []types.Bl rootFS := rootFS{ Type: "layers", - DiffIDs: []string{}, + DiffIDs: []digest.Digest{}, BaseLayer: "", } var layers []descriptor diff --git a/vendor/github.com/containers/image/image/manifest.go b/vendor/github.com/containers/image/image/manifest.go index 351bf515..0f3b9411 100644 --- a/vendor/github.com/containers/image/image/manifest.go +++ b/vendor/github.com/containers/image/image/manifest.go @@ -3,6 +3,7 @@ package image import ( "time" + "github.com/docker/distribution/digest" "github.com/docker/engine-api/types/strslice" "github.com/containers/image/manifest" @@ -46,9 +47,9 @@ type imageHistory struct { } type rootFS struct { - Type string `json:"type"` - DiffIDs []string `json:"diff_ids,omitempty"` - BaseLayer string `json:"base_layer,omitempty"` + Type string `json:"type"` + DiffIDs []digest.Digest `json:"diff_ids,omitempty"` + BaseLayer string `json:"base_layer,omitempty"` } // genericManifest is an interface for parsing, modifying image manifests and related data. diff --git a/vendor/github.com/containers/image/types/types.go b/vendor/github.com/containers/image/types/types.go index 313642ef..d0a7c0ed 100644 --- a/vendor/github.com/containers/image/types/types.go +++ b/vendor/github.com/containers/image/types/types.go @@ -221,7 +221,7 @@ type ManifestUpdateOptions struct { type ManifestUpdateInformation struct { Destination ImageDestination // and yes, UpdatedManifest may write to Destination (see the schema2 → schema1 conversion logic in image/docker_schema2.go) LayerInfos []BlobInfo // Complete BlobInfos (size+digest) which have been uploaded, in order (the root layer first, and then successive layered layers) - LayerDiffIDs []string // Digest values for the _uncompressed_ contents of the blobs which have been uploaded, in the same order. + LayerDiffIDs []digest.Digest // Digest values for the _uncompressed_ contents of the blobs which have been uploaded, in the same order. } // ImageInspectInfo is a set of metadata describing Docker images, primarily their manifest and configuration.