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>
84 lines
2.4 KiB
Go
84 lines
2.4 KiB
Go
package client
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"net/url"
|
|
|
|
"github.com/docker/docker/api/types"
|
|
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/registry"
|
|
"github.com/docker/docker/runconfig"
|
|
)
|
|
|
|
// CmdCommit creates a new image from a container's changes.
|
|
//
|
|
// Usage: docker commit [OPTIONS] CONTAINER [REPOSITORY[:TAG]]
|
|
func (cli *DockerCli) CmdCommit(args ...string) error {
|
|
cmd := Cli.Subcmd("commit", []string{"CONTAINER [REPOSITORY[:TAG]]"}, "Create a new image from a container's changes", true)
|
|
flPause := cmd.Bool([]string{"p", "-pause"}, true, "Pause container during commit")
|
|
flComment := cmd.String([]string{"m", "-message"}, "", "Commit message")
|
|
flAuthor := cmd.String([]string{"a", "#author", "-author"}, "", "Author (e.g., \"John Hannibal Smith <hannibal@a-team.com>\")")
|
|
flChanges := opts.NewListOpts(nil)
|
|
cmd.Var(&flChanges, []string{"c", "-change"}, "Apply Dockerfile instruction to the created image")
|
|
// FIXME: --run is deprecated, it will be replaced with inline Dockerfile commands.
|
|
flConfig := cmd.String([]string{"#run", "#-run"}, "", "This option is deprecated and will be removed in a future version in favor of inline Dockerfile-compatible commands")
|
|
cmd.Require(flag.Max, 2)
|
|
cmd.Require(flag.Min, 1)
|
|
|
|
cmd.ParseFlags(args, true)
|
|
|
|
var (
|
|
name = cmd.Arg(0)
|
|
repository, tag = parsers.ParseRepositoryTag(cmd.Arg(1))
|
|
)
|
|
|
|
//Check if the given image name can be resolved
|
|
if repository != "" {
|
|
if err := registry.ValidateRepositoryName(repository); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
v := url.Values{}
|
|
v.Set("container", name)
|
|
v.Set("repo", repository)
|
|
v.Set("tag", tag)
|
|
v.Set("comment", *flComment)
|
|
v.Set("author", *flAuthor)
|
|
for _, change := range flChanges.GetAll() {
|
|
v.Add("changes", change)
|
|
}
|
|
|
|
if *flPause != true {
|
|
v.Set("pause", "0")
|
|
}
|
|
|
|
var (
|
|
config *runconfig.Config
|
|
response types.ContainerCommitResponse
|
|
)
|
|
|
|
if *flConfig != "" {
|
|
config = &runconfig.Config{}
|
|
if err := json.Unmarshal([]byte(*flConfig), config); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
serverResp, err := cli.call("POST", "/commit?"+v.Encode(), config, nil)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
defer serverResp.body.Close()
|
|
|
|
if err := json.NewDecoder(serverResp.body).Decode(&response); err != nil {
|
|
return err
|
|
}
|
|
|
|
fmt.Fprintln(cli.out, response.ID)
|
|
return nil
|
|
}
|