working commit

pkg/repocli/pushimage.go

@@ -17,7 +17,7 @@ import (
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )
 
-func (down *Loader) Push(ctx context.Context, rawref, dir, osname, arch string) error {
+func (down *Loader) Push(ctx context.Context, dir, rawref, osname, arch string) error {
 	var err error
 
 	ref, err := NewReferer(rawref)
@@ -45,23 +45,29 @@ func (down *Loader) Push(ctx context.Context, rawref, dir, osname, arch string)
 		layers = append(layers, man.Layers...)
 		layers = append(layers, man.Config)
 		for _, layer := range layers {
-			id, _, err := down.cli.GetUpload(ctx, ref.RawRepo())
-			if err != nil {
-				return err
-			}
 			digstr := layer.Digest.String()
-			size, reader, err := imager.LayerReader(ctx, digstr)
+			exists, _, err := down.cli.BlobExists(ctx, ref.RawRepo(), digstr)
 			if err != nil {
 				return err
 			}
-			defer reader.Close()
-			_, err = down.cli.PatchUpload(ctx, ref.RawRepo(), reader, id, size)
-			if err != nil {
-				return err
-			}
-			_, err = down.cli.PutUpload(ctx, ref.RawRepo(), nil, id, digstr, size)
-			if err != nil {
-				return err
+			if !exists {
+				id, _, err := down.cli.GetUpload(ctx, ref.RawRepo())
+				if err != nil {
+					return err
+				}
+				size, reader, err := imager.LayerReader(ctx, digstr)
+				if err != nil {
+					return err
+				}
+				defer reader.Close()
+				_, err = down.cli.PatchUpload(ctx, ref.RawRepo(), reader, id, size)
+				if err != nil {
+					return err
+				}
+				_, err = down.cli.PutUpload(ctx, ref.RawRepo(), nil, id, digstr, size)
+				if err != nil {
+					return err
+				}
 			}
 		}
 		err = down.cli.PutManifest(ctx, ref.Raw(), mandata, mime)