mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
96ce3a194a
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>
77 lines
2.1 KiB
Go
77 lines
2.1 KiB
Go
package client
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
"net/url"
|
|
"os"
|
|
|
|
Cli "github.com/docker/docker/cli"
|
|
"github.com/docker/docker/opts"
|
|
flag "github.com/docker/docker/pkg/mflag"
|
|
"github.com/docker/docker/pkg/parsers"
|
|
"github.com/docker/docker/pkg/urlutil"
|
|
"github.com/docker/docker/registry"
|
|
)
|
|
|
|
// CmdImport creates an empty filesystem image, imports the contents of the tarball into the image, and optionally tags the image.
|
|
//
|
|
// The URL argument is the address of a tarball (.tar, .tar.gz, .tgz, .bzip, .tar.xz, .txz) file or a path to local file relative to docker client. If the URL is '-', then the tar file is read from STDIN.
|
|
//
|
|
// Usage: docker import [OPTIONS] file|URL|- [REPOSITORY[:TAG]]
|
|
func (cli *DockerCli) CmdImport(args ...string) error {
|
|
cmd := Cli.Subcmd("import", []string{"file|URL|- [REPOSITORY[:TAG]]"}, "Create an empty filesystem image and import the contents of the\ntarball (.tar, .tar.gz, .tgz, .bzip, .tar.xz, .txz) into it, then\noptionally tag it.", true)
|
|
flChanges := opts.NewListOpts(nil)
|
|
cmd.Var(&flChanges, []string{"c", "-change"}, "Apply Dockerfile instruction to the created image")
|
|
cmd.Require(flag.Min, 1)
|
|
|
|
cmd.ParseFlags(args, true)
|
|
|
|
var (
|
|
v = url.Values{}
|
|
src = cmd.Arg(0)
|
|
repository = cmd.Arg(1)
|
|
)
|
|
|
|
v.Set("fromSrc", src)
|
|
v.Set("repo", repository)
|
|
for _, change := range flChanges.GetAll() {
|
|
v.Add("changes", change)
|
|
}
|
|
if cmd.NArg() == 3 {
|
|
fmt.Fprintf(cli.err, "[DEPRECATED] The format 'file|URL|- [REPOSITORY [TAG]]' has been deprecated. Please use file|URL|- [REPOSITORY[:TAG]]\n")
|
|
v.Set("tag", cmd.Arg(2))
|
|
}
|
|
|
|
if repository != "" {
|
|
//Check if the given image name can be resolved
|
|
repo, _ := parsers.ParseRepositoryTag(repository)
|
|
if err := registry.ValidateRepositoryName(repo); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
var in io.Reader
|
|
|
|
if src == "-" {
|
|
in = cli.in
|
|
} else if !urlutil.IsURL(src) {
|
|
v.Set("fromSrc", "-")
|
|
file, err := os.Open(src)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer file.Close()
|
|
in = file
|
|
|
|
}
|
|
|
|
sopts := &streamOpts{
|
|
rawTerminal: true,
|
|
in: in,
|
|
out: cli.out,
|
|
}
|
|
|
|
_, err := cli.stream("POST", "/images/create?"+v.Encode(), sopts)
|
|
return err
|
|
}
|