
This patch creates a new cli package that allows to combine both client and daemon commands (there is only one daemon command: docker daemon). The `-d` and `--daemon` top-level flags are deprecated and a special message is added to prompt the user to use `docker daemon`. Providing top-level daemon-specific flags for client commands result in an error message prompting the user to use `docker daemon`. This patch does not break any old but correct usages. This also makes `-d` and `--daemon` flags, as well as the `daemon` command illegal in client-only binaries. Signed-off-by: Tibor Vass <tibor@docker.com>
48 lines
1.3 KiB
Go
48 lines
1.3 KiB
Go
package client
|
|
|
|
import (
|
|
"fmt"
|
|
"net/url"
|
|
|
|
Cli "github.com/docker/docker/cli"
|
|
"github.com/docker/docker/graph/tags"
|
|
flag "github.com/docker/docker/pkg/mflag"
|
|
"github.com/docker/docker/pkg/parsers"
|
|
"github.com/docker/docker/registry"
|
|
"github.com/docker/docker/utils"
|
|
)
|
|
|
|
// CmdPull pulls an image or a repository from the registry.
|
|
//
|
|
// Usage: docker pull [OPTIONS] IMAGENAME[:TAG|@DIGEST]
|
|
func (cli *DockerCli) CmdPull(args ...string) error {
|
|
cmd := Cli.Subcmd("pull", []string{"NAME[:TAG|@DIGEST]"}, "Pull an image or a repository from a registry", true)
|
|
allTags := cmd.Bool([]string{"a", "-all-tags"}, false, "Download all tagged images in the repository")
|
|
cmd.Require(flag.Exact, 1)
|
|
|
|
cmd.ParseFlags(args, true)
|
|
|
|
var (
|
|
v = url.Values{}
|
|
remote = cmd.Arg(0)
|
|
newRemote = remote
|
|
)
|
|
taglessRemote, tag := parsers.ParseRepositoryTag(remote)
|
|
if tag == "" && !*allTags {
|
|
newRemote = utils.ImageReference(taglessRemote, tags.DEFAULTTAG)
|
|
}
|
|
if tag != "" && *allTags {
|
|
return fmt.Errorf("tag can't be used with --all-tags/-a")
|
|
}
|
|
|
|
v.Set("fromImage", newRemote)
|
|
|
|
// Resolve the Repository name from fqn to RepositoryInfo
|
|
repoInfo, err := registry.ParseRepositoryInfo(taglessRemote)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
_, _, err = cli.clientRequestAttemptLogin("POST", "/images/create?"+v.Encode(), nil, cli.out, repoInfo.Index, "pull")
|
|
return err
|
|
}
|