Merge pull request #70 from ivanilves/omg-fix-auth-pull

Fix authenticated pull requests

Gopkg.toml

@@ -20,10 +20,9 @@
 #  name = "github.com/x/y"
 #  version = "2.4.0"
 
-
 [[constraint]]
-  name = "github.com/docker/docker"
-  version = "1.13.1"
+  name = "github.com/moby/moby"
+  version = "v17.03.2-ce"
 
 [[constraint]]
   name = "github.com/jessevdk/go-flags"

main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"encoding/base64"
 	"errors"
 	"fmt"
 	"os"
@@ -124,6 +125,16 @@ func getAuthorization(t auth.TokenResponse) string {
 	return t.Method() + " " + t.Token()
 }
 
+func getPullAuth(username, password string) string {
+	if username == "" && password == "" {
+		return ""
+	}
+
+	jsonString := fmt.Sprintf("{ \"username\": \"%s\", \"password\": \"%s\" }", username, password)
+
+	return base64.StdEncoding.EncodeToString([]byte(jsonString))
+}
+
 func main() {
 	o := options{}
 
@@ -132,7 +143,7 @@ func main() {
 		os.Exit(1)
 	}
 	if o.Version {
-		println(getVersion())
+		fmt.Printf("VERSION: %s", getVersion())
 		os.Exit(0)
 	}
 	if len(o.Positional.Repositories) == 0 {
@@ -152,6 +163,8 @@ func main() {
 	repoCount := len(o.Positional.Repositories)
 	pullCount := 0
 
+	pullAuths := make(map[string]string)
+
 	type tagResult struct {
 		Tags []*tag.Tag
 		Repo string
@@ -176,6 +189,8 @@ func main() {
 				suicide(err)
 			}
 
+			pullAuths[repoLocalName] = getPullAuth(username, password)
+
 			tresp, err := auth.NewToken(registryName, repoRegistryName, username, password)
 			if err != nil {
 				suicide(err)
@@ -248,7 +263,7 @@ func main() {
 						ref := repo + ":" + tg.GetName()
 
 						fmt.Printf("PULLING %s\n", ref)
-						err := local.Pull(ref)
+						err := local.Pull(ref, pullAuths[repo])
 						if err != nil {
 							suicide(err)
 						}

tag/local/local.go

@@ -11,7 +11,7 @@ import (
 	// This "Moby" thing does not work for me...
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/client"
+	"github.com/moby/moby/client"
 
 	"github.com/tv42/httpunix"
 	"golang.org/x/net/context"
@@ -169,13 +169,18 @@ func FormatRepoName(repository, registry string) string {
 }
 
 // Pull pulls Docker image specified locally
-func Pull(ref string) error {
+func Pull(ref, auth string) error {
 	cli, err := newClient()
 	if err != nil {
 		return err
 	}
 
-	resp, err := cli.ImagePull(context.Background(), ref, types.ImagePullOptions{})
+	pullOptions := types.ImagePullOptions{RegistryAuth: auth}
+	if auth == "" {
+		pullOptions = types.ImagePullOptions{}
+	}
+
+	resp, err := cli.ImagePull(context.Background(), ref, pullOptions)
 	if err != nil {
 		return err
 	}