From 70fb34d3d51a98b8603c04e58344f77596219526 Mon Sep 17 00:00:00 2001 From: Marcos Lilljedahl Date: Tue, 24 Oct 2017 15:29:18 -0300 Subject: [PATCH] Disable image pulling and update docker cli --- docker/docker.go | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/docker/docker.go b/docker/docker.go index 08876c7..bf595cf 100644 --- a/docker/docker.go +++ b/docker/docker.go @@ -275,18 +275,18 @@ func (d *docker) CreateContainer(opts CreateContainerOpts) (string, error) { container, err := d.c.ContainerCreate(context.Background(), cf, h, networkConf, opts.ContainerName) if err != nil { - if client.IsErrImageNotFound(err) { - log.Printf("Unable to find image '%s' locally\n", opts.Image) - if err = d.pullImage(context.Background(), opts.Image); err != nil { - return "", err - } - container, err = d.c.ContainerCreate(context.Background(), cf, h, networkConf, opts.ContainerName) - if err != nil { - return "", err - } - } else { - return "", err - } + //if client.IsErrImageNotFound(err) { + //log.Printf("Unable to find image '%s' locally\n", opts.Image) + //if err = d.pullImage(context.Background(), opts.Image); err != nil { + //return "", err + //} + //container, err = d.c.ContainerCreate(context.Background(), cf, h, networkConf, opts.ContainerName) + //if err != nil { + //return "", err + //} + //} else { + return "", err + //} } if err := d.copyIfSet(opts.ServerCert, "cert.pem", containerCertDir, opts.ContainerName); err != nil { @@ -346,7 +346,7 @@ func (d *docker) ExecAttach(instanceName string, command []string, out io.Writer if err != nil { return 0, err } - resp, err := d.c.ContainerExecAttach(context.Background(), e.ID, types.ExecConfig{AttachStdout: true, AttachStderr: true, Tty: true}) + resp, err := d.c.ContainerExecAttach(context.Background(), e.ID, types.ExecStartCheck{Tty: true}) if err != nil { return 0, err }