mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
4352da7803
Add distribution package for managing pulls and pushes. This is based on the old code in the graph package, with major changes to work with the new image/layer model. Add v1 migration code. Update registry, api/*, and daemon packages to use the reference package's types where applicable. Update daemon package to use image/layer/tag stores instead of the graph package Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com> Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
100 lines
2.7 KiB
Go
100 lines
2.7 KiB
Go
package client
|
|
|
|
import (
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"net/url"
|
|
|
|
"github.com/docker/distribution/reference"
|
|
"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/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]]"}, Cli.DockerCommands["commit"].Description, 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 (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"}, "", "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)
|
|
repositoryAndTag = cmd.Arg(1)
|
|
repositoryName string
|
|
tag string
|
|
)
|
|
|
|
//Check if the given image name can be resolved
|
|
if repositoryAndTag != "" {
|
|
ref, err := reference.ParseNamed(repositoryAndTag)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if err := registry.ValidateRepositoryName(ref); err != nil {
|
|
return err
|
|
}
|
|
|
|
repositoryName = ref.Name()
|
|
|
|
switch x := ref.(type) {
|
|
case reference.Digested:
|
|
return errors.New("cannot commit to digest reference")
|
|
case reference.Tagged:
|
|
tag = x.Tag()
|
|
}
|
|
}
|
|
|
|
v := url.Values{}
|
|
v.Set("container", name)
|
|
v.Set("repo", repositoryName)
|
|
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
|
|
}
|