centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-12 06:19:22 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22861 from vdemeester/daemon-images-search-refactoring

Browse Source 
Daemon images search refactoring
This commit is contained in:
Sebastiaan van Stijn
2016-05-26 12:34:31 +02:00
parent ecdf75dca6 636c276f67
commit 75109b32db
27 changed files with 590 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/client/run.go
View File

@@ -234,7 +234,7 @@ func (cli *DockerCli) CmdRun(args ...string) error {
}
//start the container
if err := cli.client.ContainerStart(ctx, createResponse.ID); err != nil {
if err := cli.client.ContainerStart(ctx, createResponse.ID, ""); err != nil {
// If we have holdHijackedConnection, we should notify
// holdHijackedConnection we are going to exit and wait
// to avoid the terminal are not restored.

4
api/client/start.go
View File

@@ -113,7 +113,7 @@ func (cli *DockerCli) CmdStart(args ...string) error {
})
// 3. Start the container.
if err := cli.client.ContainerStart(ctx, container); err != nil {
if err := cli.client.ContainerStart(ctx, container, ""); err != nil {
cancelFun()
<-cErr
return err
@@ -147,7 +147,7 @@ func (cli *DockerCli) CmdStart(args ...string) error {
func (cli *DockerCli) startContainersWithoutAttachments(ctx context.Context, containers []string) error {
var failedContainers []string
for _, container := range containers {
if err := cli.client.ContainerStart(ctx, container); err != nil {
if err := cli.client.ContainerStart(ctx, container, ""); err != nil {
fmt.Fprintf(cli.err, "%s\n", err)
failedContainers = append(failedContainers, container)
} else {