From e56a58e4edd68f7427a1bd4d3abf11837cace3a5 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 11 Oct 2017 15:31:09 +0200 Subject: [PATCH] Updates for updated moby version Signed-off-by: Sebastiaan van Stijn --- cli/command/container/create.go | 2 +- cli/command/container/exec.go | 5 ++++- cli/command/service/logs.go | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cli/command/container/create.go b/cli/command/container/create.go index e87e3fb28a..dc0f4735ba 100644 --- a/cli/command/container/create.go +++ b/cli/command/container/create.go @@ -194,7 +194,7 @@ func createContainer(ctx context.Context, dockerCli command.Cli, containerConfig //if image not found try to pull it if err != nil { - if apiclient.IsErrImageNotFound(err) && namedRef != nil { + if apiclient.IsErrNotFound(err) && namedRef != nil { fmt.Fprintf(stderr, "Unable to find image '%s' locally\n", reference.FamiliarString(namedRef)) // we don't want to write to stdout anything apart from container.ID diff --git a/cli/command/container/exec.go b/cli/command/container/exec.go index 8eb57cff7f..46775f3048 100644 --- a/cli/command/container/exec.go +++ b/cli/command/container/exec.go @@ -122,7 +122,10 @@ func interactiveExec(ctx context.Context, dockerCli command.Cli, execConfig *typ } client := dockerCli.Client() - resp, err := client.ContainerExecAttach(ctx, execID, *execConfig) + execStartCheck := types.ExecStartCheck{ + Tty: execConfig.Tty, + } + resp, err := client.ContainerExecAttach(ctx, execID, execStartCheck) if err != nil { return err } diff --git a/cli/command/service/logs.go b/cli/command/service/logs.go index b87034b4e4..272c68e9f2 100644 --- a/cli/command/service/logs.go +++ b/cli/command/service/logs.go @@ -97,7 +97,7 @@ func runLogs(dockerCli *command.DockerCli, opts *logsOptions) error { service, _, err := cli.ServiceInspectWithRaw(ctx, opts.target, types.ServiceInspectOptions{}) if err != nil { // if it's any error other than service not found, it's Real - if !client.IsErrServiceNotFound(err) { + if !client.IsErrNotFound(err) { return err } task, _, err := cli.TaskInspectWithRaw(ctx, opts.target)