toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup the structure of the cli package.

Browse Source 
Move all flags into cli/flags
Move usage help into cli/usage.go

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 33c9edaf6c5401fc1891713d1ad8d861e6cea51f
Component: engine
This commit is contained in:
Daniel Nephin
2016-04-21 17:51:28 -04:00
parent 7b8da9de87
commit 63df8770d3
8 changed files with 39 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/api/client/cli.go
View File

@ -9,7 +9,7 @@ import (
"runtime"
"github.com/docker/docker/api"
"github.com/docker/docker/cli"
cliflags "github.com/docker/docker/cli/flags"
"github.com/docker/docker/cliconfig"
"github.com/docker/docker/cliconfig/credentials"
"github.com/docker/docker/dockerversion"
@ -112,7 +112,7 @@ func (cli *DockerCli) restoreTerminal(in io.Closer) error {
// The key file, protocol (i.e. unix) and address are passed in as strings, along with the tls.Config. If the tls.Config
// is set the client scheme will be set to https.
// The client will be given a 32-second timeout (see https://github.com/docker/docker/pull/8035).
func NewDockerCli(in io.ReadCloser, out, err io.Writer, clientFlags *cli.ClientFlags) *DockerCli {
func NewDockerCli(in io.ReadCloser, out, err io.Writer, clientFlags *cliflags.ClientFlags) *DockerCli {
cli := &DockerCli{
in: in,
out: out,