docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9996 from tianon/gofmt 

Add "gofmt" from Go 1.3.3
This commit is contained in:
Alexander Morozov 2015-01-09 13:14:02 -08:00
parent b79c31ce97 b20363c4c0
commit fac1213ecb
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -99,6 +99,10 @@ RUN cd /usr/local/go/src \
# Reinstall standard library with netgo # Reinstall standard library with netgo
RUN go clean -i net && go install -tags netgo std RUN go clean -i net && go install -tags netgo std
# We still support compiling with older Go, so need to grab older "gofmt"
ENV GOFMT_VERSION 1.3.3
RUN curl -sSL https://storage.googleapis.com/golang/go${GOFMT_VERSION}.$(go env GOOS)-$(go env GOARCH).tar.gz | tar -C /go/bin -xz --strip-components=2 go/bin/gofmt
# Grab Go's cover tool for dead-simple code coverage testing # Grab Go's cover tool for dead-simple code coverage testing
RUN go get golang.org/x/tools/cmd/cover RUN go get golang.org/x/tools/cmd/cover

5
api/client/utils.go
View File

@ -260,10 +260,7 @@ func (cli *DockerCli) monitorTtySize(id string, isExec bool) error {
sigchan := make(chan os.Signal, 1) sigchan := make(chan os.Signal, 1)
gosignal.Notify(sigchan, signal.SIGWINCH) gosignal.Notify(sigchan, signal.SIGWINCH)
go func() { go func() {
// This tmp := range..., _ = tmp workaround is needed to for _ := range sigchan {
// suppress gofmt warnings while still preserve go1.3 compatibility
for tmp := range sigchan {
_ = tmp
cli.resizeTty(id, isExec) cli.resizeTty(id, isExec)
} }
}() }()