Moving Image{Push,Pull}Privileged to trust.go

vdemeester · vdemeester · commit ad4e20cd9207 · 2016-06-10T12:07:32.000+02:00
Signed-off-by: Vincent Demeester &lt;vincent@sbr.pm&gt;
diff --git a/api/client/commands.go b/api/client/commands.go
@@ -11,7 +11,6 @@ func (cli *DockerCli) Command(name string) func(...string) error {
 		"login":   cli.CmdLogin,
 		"logout":  cli.CmdLogout,
 		"ps":      cli.CmdPs,
-		"push":    cli.CmdPush,
 		"update":  cli.CmdUpdate,
 	}[name]
 }
diff --git a/api/client/image/pull.go b/api/client/image/pull.go
@@ -41,7 +41,6 @@ func NewPullCommand(dockerCli *client.DockerCli) *cobra.Command {
 }
 
 func runPull(dockerCli *client.DockerCli, opts pullOptions) error {
-
 	distributionRef, err := reference.ParseNamed(opts.remote)
 	if err != nil {
 		return err
diff --git a/api/client/image/push.go b/api/client/image/push.go
@@ -30,7 +30,6 @@ func NewPushCommand(dockerCli *client.DockerCli) *cobra.Command {
 }
 
 func runPush(dockerCli *client.DockerCli, remote string) error {
-
 	ref, err := reference.ParseNamed(remote)
 	if err != nil {
 		return err
diff --git a/api/client/pull.go b/api/client/pull.go
diff --git a/api/client/push.go b/api/client/push.go
diff --git a/api/client/trust.go b/api/client/trust.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io"
 	"net"
 	"net/http"
 	"net/url"
@@ -566,3 +567,39 @@ func (cli *DockerCli) addTargetToAllSignableRoles(repo *client.NotaryRepository,
 
 	return repo.AddTarget(target, signableRoles...)
 }
+
+// ImagePullPrivileged pulls the image and displays it to the output
+func (cli *DockerCli) ImagePullPrivileged(ctx context.Context, authConfig types.AuthConfig, ref string, requestPrivilege types.RequestPrivilegeFunc, all bool) error {
+
+	encodedAuth, err := EncodeAuthToBase64(authConfig)
+	if err != nil {
+		return err
+	}
+	options := types.ImagePullOptions{
+		RegistryAuth:  encodedAuth,
+		PrivilegeFunc: requestPrivilege,
+		All:           all,
+	}
+
+	responseBody, err := cli.client.ImagePull(ctx, ref, options)
+	if err != nil {
+		return err
+	}
+	defer responseBody.Close()
+
+	return jsonmessage.DisplayJSONMessagesStream(responseBody, cli.out, cli.outFd, cli.isTerminalOut, nil)
+}
+
+// ImagePushPrivileged push the image
+func (cli *DockerCli) ImagePushPrivileged(ctx context.Context, authConfig types.AuthConfig, ref string, requestPrivilege types.RequestPrivilegeFunc) (io.ReadCloser, error) {
+	encodedAuth, err := EncodeAuthToBase64(authConfig)
+	if err != nil {
+		return nil, err
+	}
+	options := types.ImagePushOptions{
+		RegistryAuth:  encodedAuth,
+		PrivilegeFunc: requestPrivilege,
+	}
+
+	return cli.client.ImagePush(ctx, ref, options)
+}
diff --git a/cli/usage.go b/cli/usage.go
@@ -16,7 +16,6 @@ var DockerCommandUsage = []Command{
 	{"login", "Log in to a Docker registry"},
 	{"logout", "Log out from a Docker registry"},
 	{"ps", "List containers"},
-	{"push", "Push an image or a repository to a registry"},
 	{"update", "Update configuration of one or more containers"},
 }
 

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ func (cli *DockerCli) Command(name string) func(...string) error {`
`11`	`11`	`"login": cli.CmdLogin,`
`12`	`12`	`"logout": cli.CmdLogout,`
`13`	`13`	`"ps": cli.CmdPs,`
`14`		`- "push": cli.CmdPush,`
`15`	`14`	`"update": cli.CmdUpdate,`
`16`	`15`	`}[name]`
`17`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,6 @@ func NewPullCommand(dockerCli client.DockerCli) cobra.Command {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`func runPull(dockerCli *client.DockerCli, opts pullOptions) error {`
`44`		`-`
`45`	`44`	`distributionRef, err := reference.ParseNamed(opts.remote)`
`46`	`45`	`if err != nil {`
`47`	`46`	`return err`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@ func NewPushCommand(dockerCli client.DockerCli) cobra.Command {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`func runPush(dockerCli *client.DockerCli, remote string) error {`
`33`		`-`
`34`	`33`	`ref, err := reference.ParseNamed(remote)`
`35`	`34`	`if err != nil {`
`36`	`35`	`return err`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@ var DockerCommandUsage = []Command{`
`16`	`16`	`{"login", "Log in to a Docker registry"},`
`17`	`17`	`{"logout", "Log out from a Docker registry"},`
`18`	`18`	`{"ps", "List containers"},`
`19`		`- {"push", "Push an image or a repository to a registry"},`
`20`	`19`	`{"update", "Update configuration of one or more containers"},`
`21`	`20`	`}`
`22`	`21`