Add "gofmt" from Go 1.3.3
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
This commit is contained in:
parent
2677f1add4
commit
b20363c4c0
2 changed files with 5 additions and 4 deletions
|
@ -99,6 +99,10 @@ RUN cd /usr/local/go/src \
|
|||
# Reinstall standard library with netgo
|
||||
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
|
||||
RUN go get golang.org/x/tools/cmd/cover
|
||||
|
||||
|
|
|
@ -260,10 +260,7 @@ func (cli *DockerCli) monitorTtySize(id string, isExec bool) error {
|
|||
sigchan := make(chan os.Signal, 1)
|
||||
gosignal.Notify(sigchan, signal.SIGWINCH)
|
||||
go func() {
|
||||
// This tmp := range..., _ = tmp workaround is needed to
|
||||
// suppress gofmt warnings while still preserve go1.3 compatibility
|
||||
for tmp := range sigchan {
|
||||
_ = tmp
|
||||
for _ := range sigchan {
|
||||
cli.resizeTty(id, isExec)
|
||||
}
|
||||
}()
|
||||
|
|
Loading…
Reference in a new issue