From 27fd1bffb02da5c5d951581bcbe3e7587352035d Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Fri, 10 Jun 2016 12:07:23 +0200 Subject: [PATCH 1/3] Migrate pull command to cobra Signed-off-by: Vincent Demeester --- cobraadaptor/adaptor.go | 1 + usage.go | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/cobraadaptor/adaptor.go b/cobraadaptor/adaptor.go index a9bdd1a170..2f3d14821e 100644 --- a/cobraadaptor/adaptor.go +++ b/cobraadaptor/adaptor.go @@ -59,6 +59,7 @@ func NewCobraAdaptor(clientFlags *cliflags.ClientFlags) CobraAdaptor { image.NewLoadCommand(dockerCli), image.NewRemoveCommand(dockerCli), image.NewSaveCommand(dockerCli), + image.NewPullCommand(dockerCli), image.NewSearchCommand(dockerCli), image.NewImportCommand(dockerCli), image.NewTagCommand(dockerCli), diff --git a/usage.go b/usage.go index 20eae80f74..c063dd0da6 100644 --- a/usage.go +++ b/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"}, - {"pull", "Pull an image or a repository from a registry"}, {"push", "Push an image or a repository to a registry"}, {"update", "Update configuration of one or more containers"}, } From 16dbf630a2fb98985d7b39b7c54090d211021e2e Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Fri, 10 Jun 2016 12:07:28 +0200 Subject: [PATCH 2/3] Migrate push command to cobra Signed-off-by: Vincent Demeester --- cobraadaptor/adaptor.go | 1 + 1 file changed, 1 insertion(+) diff --git a/cobraadaptor/adaptor.go b/cobraadaptor/adaptor.go index 2f3d14821e..ec0c6d39c0 100644 --- a/cobraadaptor/adaptor.go +++ b/cobraadaptor/adaptor.go @@ -60,6 +60,7 @@ func NewCobraAdaptor(clientFlags *cliflags.ClientFlags) CobraAdaptor { image.NewRemoveCommand(dockerCli), image.NewSaveCommand(dockerCli), image.NewPullCommand(dockerCli), + image.NewPushCommand(dockerCli), image.NewSearchCommand(dockerCli), image.NewImportCommand(dockerCli), image.NewTagCommand(dockerCli), From 0679ae5bf4c34bb8d099770e85bb9023bfe23839 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Fri, 10 Jun 2016 12:07:32 +0200 Subject: [PATCH 3/3] Moving Image{Push,Pull}Privileged to trust.go Signed-off-by: Vincent Demeester --- usage.go | 1 - 1 file changed, 1 deletion(-) diff --git a/usage.go b/usage.go index c063dd0da6..7ebbf2d12f 100644 --- a/usage.go +++ b/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"}, }