working commit

pkg/repocli/blobexist.go

@@ -27,8 +27,6 @@ func (cli *Client) BlobExists(ctx context.Context, rawrepo string, digest string
 		return exist, size, err
 	}
 	uri := ref.BlobEP(digest)
-
-	fmt.Println(uri)
 	req, err := http.NewRequestWithContext(ctx, http.MethodHead, uri, nil)
 	if err != nil {
 		return exist, size, err

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)

pkg/repocli/pushimage_test.go

@@ -28,7 +28,7 @@ func TestPushImage(t *testing.T) {
 		load := NewLoader(cli)
 		require.NotNil(t, load)
 
-		err := load.Push(ctx, "localhost:1025/test:v1.0", "test-oci", "", "")
+		err := load.Push(ctx, "test-oci", "localhost:1025/test:v1.0", "", "")
 		require.NoError(t, err)
 	}
 	//return

pkg/repocli/referer.go

@@ -144,3 +144,9 @@ func (ref *Referer) CatalogEP() string {
 func (ref *Referer) Userinfo() (string, string) {
 	return ref.user, ref.pass
 }
+
+func (ref *Referer) SetUserinfo(user, pass string) {
+	if user != "" && pass != "" {
+		ref.user, ref.pass = user, pass
+	}
+}