Merge pull request #974 from 907th/fix_jsonmessage_dependency

Fix dependency: github.com/docker/docker/utils was moved to pkg/jsonmessage

.drone.yml

@@ -11,7 +11,6 @@ script:
   - sudo apt-get -y install git zip libsqlite3-dev sqlite3 rpm 1> /dev/null 2> /dev/null
   - gem install fpm
   - rbenv rehash
-  - make docker
   - make deps
   - make test
   - make test_postgres

Makefile

@@ -8,10 +8,6 @@ deps:
 	go get github.com/GeertJohan/go.rice/rice
 	go get -t -v ./...
 
-docker:
-	mkdir -p $$GOPATH/src/github.com/docker/docker
-	git clone --depth=1 --branch=v1.5.0 git://github.com/docker/docker.git $$GOPATH/src/github.com/docker/docker
-
 test:
 	@test -z "$(shell find . -name '*.go' | xargs gofmt -l)" || (echo "Need to run 'go fmt ./...'"; exit 1)
 	go vet ./...

shared/build/docker/client.go

@@ -15,9 +15,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/docker/docker/pkg/jsonmessage"
 	"github.com/docker/docker/pkg/stdcopy"
 	"github.com/docker/docker/pkg/term"
-	"github.com/docker/docker/utils"
 )
 
 const (
@@ -353,7 +353,7 @@ func (c *Client) stream(method, path string, in io.Reader, out io.Writer, header
 
 		// it may not make sense to put this code here, but it works for
 		// us at the moment, and I don't feel like refactoring
-		return utils.DisplayJSONMessagesStream(resp.Body, out, terminalFd, isTerminal)
+		return jsonmessage.DisplayJSONMessagesStream(resp.Body, out, terminalFd, isTerminal)
 	}
 	// otherwise plain text
 	if _, err := io.Copy(out, resp.Body); err != nil {