From 2d6cb93b3cd5e58368f4ba74741b81cd4aff9d3f Mon Sep 17 00:00:00 2001 From: "Jonathan Leibiusky @xetorthio" Date: Tue, 31 Oct 2017 13:23:55 -0300 Subject: [PATCH] Remove docker/docker dependency :) :) :) --- Gopkg.lock | 22 ++-------------------- Gopkg.toml | 4 ---- docker/docker.go | 10 ++-------- 3 files changed, 4 insertions(+), 32 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index b5141ba..e3f3277 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -7,24 +7,12 @@ revision = "b3f5b5de7bbce0acc6a7fc0a4c2b88db678e262e" version = "v1.0.0" -[[projects]] - branch = "master" - name = "github.com/Azure/go-ansiterm" - packages = [".","winterm"] - revision = "d6e3b3328b783f23731bc4d058875b0371ff8109" - [[projects]] name = "github.com/Microsoft/go-winio" packages = ["."] revision = "78439966b38d69bf38227fbf57ac8a6fee70f69a" version = "v0.4.5" -[[projects]] - name = "github.com/Sirupsen/logrus" - packages = ["."] - revision = "f006c2ac4710855cf0f916dd6b77acf6b048dc6e" - version = "v1.0.3" - [[projects]] name = "github.com/aws/aws-sdk-go" packages = ["aws","aws/awserr","aws/awsutil","aws/client","aws/client/metadata","aws/corehandlers","aws/credentials","aws/credentials/ec2rolecreds","aws/credentials/endpointcreds","aws/credentials/stscreds","aws/defaults","aws/ec2metadata","aws/endpoints","aws/request","aws/session","aws/signer/v4","internal/shareddefaults","private/protocol","private/protocol/ec2query","private/protocol/query","private/protocol/query/queryutil","private/protocol/rest","private/protocol/xml/xmlutil","service/autoscaling","service/ec2","service/sts"] @@ -54,12 +42,6 @@ packages = ["digestset","reference"] revision = "edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c" -[[projects]] - name = "github.com/docker/docker" - packages = ["pkg/jsonlog","pkg/jsonmessage","pkg/term","pkg/term/windows"] - revision = "092cba3727bb9b4a2f0e922cd6c0f93ea270e363" - version = "v1.13.1" - [[projects]] name = "github.com/docker/go-connections" packages = ["nat","sockets","tlsconfig"] @@ -266,7 +248,7 @@ [[projects]] branch = "master" name = "golang.org/x/crypto" - packages = ["acme","acme/autocert","curve25519","ed25519","ed25519/internal/edwards25519","ssh","ssh/terminal"] + packages = ["acme","acme/autocert","curve25519","ed25519","ed25519/internal/edwards25519","ssh"] revision = "541b9d50ad47e36efd8fb423e938e59ff1691f68" [[projects]] @@ -308,6 +290,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "cb4ed32010df0327d18dee3e1c736249d8d1df75e45f90c2fad5b2c1c5028b98" + inputs-digest = "235d01ea73c9f692dddf5fcf203a99dcd2ad75c6ef0fc3d51a60bf949d4fbdc9" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index f915fff..59926f2 100644 --- 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 index 1b6e1dc..1cf0dfe 100644 --- 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 {