Remove docker/docker dependency :) :) :)

rutcast · Oct 31, 2017 · 2d6cb93 · 2d6cb93
1 parent 6009bfd
commit 2d6cb93
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 32 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -25,10 +25,6 @@
   name = "github.com/docker/distribution"
   version = "2.6.2"
 
-[[constraint]]
-  name = "github.com/docker/docker"
-  version = "1.13.1"
-
 [[constraint]]
   name = "github.com/docker/go-connections"
   version = "0.3.0"

diff --git a/docker/docker.go b/docker/docker.go
@@ -21,7 +21,6 @@ import (
 	"docker.io/go-docker/api/types/swarm"
 	"docker.io/go-docker/api/types/volume"
 	"github.com/containerd/containerd/reference"
-	"github.com/docker/docker/pkg/jsonmessage"
 	"github.com/play-with-docker/play-with-docker/config"
 )
 
@@ -409,14 +408,9 @@ func (d *docker) pullImage(ctx context.Context, image string) error {
 	if err != nil {
 		return err
 	}
-	defer responseBody.Close()
+	_, err = io.Copy(ioutil.Discard, responseBody)
 
-	return jsonmessage.DisplayJSONMessagesStream(
-		responseBody,
-		os.Stderr,
-		os.Stdout.Fd(),
-		false,
-		nil)
+	return err
 }
 
 func (d *docker) copyIfSet(content []byte, fileName, path, containerName string) error {