update containers/image

ImageDestination.{PutBlob,TryReusingBlob} are extended to receive the index of the layer in the corresponding image. Some transports, containers storage in particular, require the layers to be comitted in sequence. The new sequencing allows containers storage to commit the layers in PutBlob. Signed-off-by: Valentin Rothberg <[email protected]>
containers · Apr 17, 2019 · eebf683 · eebf683
1 parent e255ccc
commit eebf683
Show file tree

Hide file tree

Showing 14 changed files with 342 additions and 169 deletions.
diff --git a/cmd/skopeo/layers.go b/cmd/skopeo/layers.go
@@ -121,12 +121,12 @@ func (opts *layersOptions) run(args []string, stdout io.Writer) (retErr error) {
 		}
 	}()
 
-	for _, bd := range blobDigests {
+	for index, bd := range blobDigests {
 		r, blobSize, err := rawSource.GetBlob(ctx, types.BlobInfo{Digest: bd.digest, Size: -1}, cache)
 		if err != nil {
 			return err
 		}
-		if _, err := dest.PutBlob(ctx, r, types.BlobInfo{Digest: bd.digest, Size: blobSize}, cache, bd.isConfig); err != nil {
+		if _, err := dest.PutBlob(ctx, r, types.BlobInfo{Digest: bd.digest, Size: blobSize}, index, cache, bd.isConfig); err != nil {
 			if closeErr := r.Close(); closeErr != nil {
 				return errors.Wrapf(err, " (close error: %v)", closeErr)
 			}

diff --git a/vendor.conf b/vendor.conf
@@ -2,8 +2,8 @@
 github.com/urfave/cli v1.20.0
 github.com/kr/pretty v0.1.0
 github.com/kr/text v0.1.0
-github.com/containers/image e9c3d17ddb8cb5d48450bc0588525b17b181c049
-github.com/containers/buildah 25b7c1164a262934a6526ded1115dfacfc51f8ec
+github.com/containers/image commit https://github.com/vrothberg/image
+github.com/containers/buildah image-commit https://github.com/vrothberg/buildah
 github.com/vbauerster/mpb v3.3.4
 github.com/mattn/go-isatty v0.0.4
 github.com/VividCortex/ewma v1.1.1

diff --git a/vendor/github.com/containers/buildah/vendor.conf b/vendor/github.com/containers/buildah/vendor.conf
diff --git a/vendor/github.com/containers/image/copy/copy.go b/vendor/github.com/containers/image/copy/copy.go
diff --git a/vendor/github.com/containers/image/directory/directory_dest.go b/vendor/github.com/containers/image/directory/directory_dest.go
diff --git a/vendor/github.com/containers/image/docker/docker_image_dest.go b/vendor/github.com/containers/image/docker/docker_image_dest.go
diff --git a/vendor/github.com/containers/image/docker/tarfile/dest.go b/vendor/github.com/containers/image/docker/tarfile/dest.go
diff --git a/vendor/github.com/containers/image/image/docker_schema2.go b/vendor/github.com/containers/image/image/docker_schema2.go