darkkirb/harness-drone
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #974 from 907th/fix_jsonmessage_dependency

Browse source 
Fix dependency: github.com/docker/docker/utils was moved to pkg/jsonmessage
This commit is contained in:
Brad Rydzewski 2015-05-31 13:02:14 -07:00
commit bc8a602d89
3 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.drone.yml
View file

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

4
Makefile
View file

@ -8,10 +8,6 @@ deps:
go get github.com/GeertJohan/go.rice/rice go get github.com/GeertJohan/go.rice/rice
go get -t -v ./... 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:
@test -z "$(shell find . -name '*.go' | xargs gofmt -l)" || (echo "Need to run 'go fmt ./...'"; exit 1) @test -z "$(shell find . -name '*.go' | xargs gofmt -l)" || (echo "Need to run 'go fmt ./...'"; exit 1)
go vet ./... go vet ./...

4
shared/build/docker/client.go
View file

@ -15,9 +15,9 @@ import (
"strings" "strings"
"time" "time"
"github.com/docker/docker/pkg/jsonmessage"
"github.com/docker/docker/pkg/stdcopy" "github.com/docker/docker/pkg/stdcopy"
"github.com/docker/docker/pkg/term" "github.com/docker/docker/pkg/term"
"github.com/docker/docker/utils"
) )
const ( 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 // 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 // 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 // otherwise plain text
if _, err := io.Copy(out, resp.Body); err != nil { if _, err := io.Copy(out, resp.Body); err != nil {