Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use IDResponse for container create response. 

Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2016-10-18 17:27:55 -07:00
parent d4d914bd52
commit f8cdc5ae71
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
container_commit.go
View File

@ -12,16 +12,16 @@ import (
) )
// ContainerCommit applies changes into a container and creates a new tagged image. // ContainerCommit applies changes into a container and creates a new tagged image.
func (cli *Client) ContainerCommit(ctx context.Context, container string, options types.ContainerCommitOptions) (types.ContainerCommitResponse, error) { func (cli *Client) ContainerCommit(ctx context.Context, container string, options types.ContainerCommitOptions) (types.IDResponse, error) {
var repository, tag string var repository, tag string
if options.Reference != "" { if options.Reference != "" {
distributionRef, err := distreference.ParseNamed(options.Reference) distributionRef, err := distreference.ParseNamed(options.Reference)
if err != nil { if err != nil {
return types.ContainerCommitResponse{}, err return types.IDResponse{}, err
} }
if _, isCanonical := distributionRef.(distreference.Canonical); isCanonical { if _, isCanonical := distributionRef.(distreference.Canonical); isCanonical {
return types.ContainerCommitResponse{}, errors.New("refusing to create a tag with a digest reference") return types.IDResponse{}, errors.New("refusing to create a tag with a digest reference")
} }
tag = reference.GetTagFromNamedRef(distributionRef) tag = reference.GetTagFromNamedRef(distributionRef)
@ -41,7 +41,7 @@ func (cli *Client) ContainerCommit(ctx context.Context, container string, option
query.Set("pause", "0") query.Set("pause", "0")
} }
var response types.ContainerCommitResponse var response types.IDResponse
resp, err := cli.post(ctx, "/commit", query, options.Config, nil) resp, err := cli.post(ctx, "/commit", query, options.Config, nil)
if err != nil { if err != nil {
return response, err return response, err

2
container_commit_test.go
View File

@ -67,7 +67,7 @@ func TestContainerCommit(t *testing.T) {
if len(changes) != len(expectedChanges) { if len(changes) != len(expectedChanges) {
return nil, fmt.Errorf("expected container changes size to be '%d', got %d", len(expectedChanges), len(changes)) return nil, fmt.Errorf("expected container changes size to be '%d', got %d", len(expectedChanges), len(changes))
} }
b, err := json.Marshal(types.ContainerCommitResponse{ b, err := json.Marshal(types.IDResponse{
ID: "new_container_id", ID: "new_container_id",
}) })
if err != nil { if err != nil {

2
interface.go
View File

@ -33,7 +33,7 @@ type CommonAPIClient interface {
// ContainerAPIClient defines API client methods for the containers // ContainerAPIClient defines API client methods for the containers
type ContainerAPIClient interface { type ContainerAPIClient interface {
ContainerAttach(ctx context.Context, container string, options types.ContainerAttachOptions) (types.HijackedResponse, error) ContainerAttach(ctx context.Context, container string, options types.ContainerAttachOptions) (types.HijackedResponse, error)
ContainerCommit(ctx context.Context, container string, options types.ContainerCommitOptions) (types.ContainerCommitResponse, error) ContainerCommit(ctx context.Context, container string, options types.ContainerCommitOptions) (types.IDResponse, error)
ContainerCreate(ctx context.Context, config *container.Config, hostConfig *container.HostConfig, networkingConfig *network.NetworkingConfig, containerName string) (container.ContainerCreateCreatedBody, error) ContainerCreate(ctx context.Context, config *container.Config, hostConfig *container.HostConfig, networkingConfig *network.NetworkingConfig, containerName string) (container.ContainerCreateCreatedBody, error)
ContainerDiff(ctx context.Context, container string) ([]types.ContainerChange, error) ContainerDiff(ctx context.Context, container string) ([]types.ContainerChange, error)
ContainerExecAttach(ctx context.Context, execID string, config types.ExecConfig) (types.HijackedResponse, error) ContainerExecAttach(ctx context.Context, execID string, config types.ExecConfig) (types.HijackedResponse, error)