unify auth (#338)

Signed-off-by: Shiwei Zhang <[email protected]>
oras-project · Nov 11, 2021 · 58fa344 · 58fa344
1 parent ce63e04
commit 58fa344
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/cmd/oras/resolver.go b/cmd/oras/resolver.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"context"
 	"crypto/tls"
 	"fmt"
 	"net/http"
@@ -52,10 +51,7 @@ func newResolver(username, password string, insecure bool, plainHTTP bool, confi
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "WARNING: Error loading auth file: %v\n", err)
 	}
-	resolver, err := cli.Resolver(context.Background(), client, plainHTTP)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "WARNING: Error loading resolver: %v\n", err)
-		resolver = docker.NewResolver(*opts)
-	}
-	return resolver, opts
+	dockerCli := cli.(*auth.Client)
+	opts.Credentials = dockerCli.Credential
+	return docker.NewResolver(*opts), opts
 }