From 2821e93af6292f782ab2c6702847aa837afb91ec Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Fri, 14 Sep 2018 14:35:38 +0900 Subject: [PATCH] update Go to 1.11 For consistency with Moby (moby/moby#37358) Signed-off-by: Akihiro Suda --- Makefile | 8 -------- control/control.go | 2 +- examples/buildkit0/buildkit.go | 2 +- examples/buildkit1/buildkit.go | 2 +- examples/buildkit2/buildkit.go | 2 +- examples/buildkit3/buildkit.go | 2 +- examples/nested-llb/main.go | 2 +- frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile | 2 +- hack/dockerfiles/generated-files.Dockerfile | 4 ++-- hack/dockerfiles/lint.Dockerfile | 2 +- hack/dockerfiles/test.Dockerfile | 10 ++++++++-- hack/dockerfiles/vendor.Dockerfile | 2 +- solver/scheduler.go | 2 +- 13 files changed, 20 insertions(+), 22 deletions(-) diff --git a/Makefile b/Makefile index 11b0f52430f1f..3bf0b79bf6380 100644 --- a/Makefile +++ b/Makefile @@ -5,14 +5,6 @@ DESTDIR=/usr/local binaries: $(BINARIES) binaries-all: $(BINARIES) $(BINARIES_EXTRA) -bin/buildctl-darwin: FORCE - mkdir -p bin - docker build --build-arg GOOS=darwin -t buildkit:buildctl-darwin --target buildctl -f ./hack/dockerfiles/test.Dockerfile --force-rm . - ( containerID=$$(docker create buildkit:buildctl-darwin noop); \ - docker cp $$containerID:/usr/bin/buildctl $@; \ - docker rm $$containerID ) - chmod +x $@ - bin/%.exe: FORCE mkdir -p bin docker build -t buildkit:$*.exe --target $*.exe -f ./hack/dockerfiles/test.Dockerfile --force-rm . diff --git a/control/control.go b/control/control.go index 8b3b7bd8ac03a..96862ed680c12 100644 --- a/control/control.go +++ b/control/control.go @@ -127,7 +127,7 @@ func (c *Controller) Prune(req *controlapi.PruneRequest, stream controlapi.Contr ReleaseUnreferenced() error }); ok { if err := c.ReleaseUnreferenced(); err != nil { - logrus.Errorf("failed to release cache metadata: %+v") + logrus.Errorf("failed to release cache metadata: %+v", err) } } } diff --git a/examples/buildkit0/buildkit.go b/examples/buildkit0/buildkit.go index d706c62572258..0539a8349db5c 100644 --- a/examples/buildkit0/buildkit.go +++ b/examples/buildkit0/buildkit.go @@ -32,7 +32,7 @@ func main() { } func goBuildBase() llb.State { - goAlpine := llb.Image("docker.io/library/golang:1.10-alpine") + goAlpine := llb.Image("docker.io/library/golang:1.11-alpine") return goAlpine. AddEnv("PATH", "/usr/local/go/bin:"+system.DefaultPathEnv). AddEnv("GOPATH", "/go"). diff --git a/examples/buildkit1/buildkit.go b/examples/buildkit1/buildkit.go index 72725c3a34943..c7a460762a1bb 100644 --- a/examples/buildkit1/buildkit.go +++ b/examples/buildkit1/buildkit.go @@ -32,7 +32,7 @@ func main() { } func goBuildBase() llb.State { - goAlpine := llb.Image("docker.io/library/golang:1.10-alpine") + goAlpine := llb.Image("docker.io/library/golang:1.11-alpine") return goAlpine. AddEnv("PATH", "/usr/local/go/bin:"+system.DefaultPathEnv). AddEnv("GOPATH", "/go"). diff --git a/examples/buildkit2/buildkit.go b/examples/buildkit2/buildkit.go index 36b95c2367052..0f1579be28688 100644 --- a/examples/buildkit2/buildkit.go +++ b/examples/buildkit2/buildkit.go @@ -32,7 +32,7 @@ func main() { } func goBuildBase() llb.State { - goAlpine := llb.Image("docker.io/library/golang:1.10-alpine") + goAlpine := llb.Image("docker.io/library/golang:1.11-alpine") return goAlpine. AddEnv("PATH", "/usr/local/go/bin:"+system.DefaultPathEnv). AddEnv("GOPATH", "/go"). diff --git a/examples/buildkit3/buildkit.go b/examples/buildkit3/buildkit.go index fabb4e80ed11e..0ae1fff165ea3 100644 --- a/examples/buildkit3/buildkit.go +++ b/examples/buildkit3/buildkit.go @@ -33,7 +33,7 @@ func main() { } func goBuildBase() llb.State { - goAlpine := llb.Image("docker.io/library/golang:1.10-alpine") + goAlpine := llb.Image("docker.io/library/golang:1.11-alpine") return goAlpine. AddEnv("PATH", "/usr/local/go/bin:"+system.DefaultPathEnv). AddEnv("GOPATH", "/go"). diff --git a/examples/nested-llb/main.go b/examples/nested-llb/main.go index c09afac1e318a..f5379ecd88aec 100644 --- a/examples/nested-llb/main.go +++ b/examples/nested-llb/main.go @@ -31,7 +31,7 @@ func main() { } func goBuildBase() llb.State { - goAlpine := llb.Image("docker.io/library/golang:1.10-alpine") + goAlpine := llb.Image("docker.io/library/golang:1.11-alpine") return goAlpine. AddEnv("PATH", "/usr/local/go/bin:"+system.DefaultPathEnv). AddEnv("GOPATH", "/go"). diff --git a/frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile b/frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile index f2923b0ca0ea4..c75650f2fdecb 100644 --- a/frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile +++ b/frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM golang:1.10-alpine AS builder +FROM --platform=$BUILDPLATFORM golang:1.11-alpine AS builder ARG BUILDTAGS="" COPY . /go/src/github.com/moby/buildkit ARG TARGETOS diff --git a/hack/dockerfiles/generated-files.Dockerfile b/hack/dockerfiles/generated-files.Dockerfile index aff303266c728..6a40f58001a37 100644 --- a/hack/dockerfiles/generated-files.Dockerfile +++ b/hack/dockerfiles/generated-files.Dockerfile @@ -1,5 +1,5 @@ -# protoc is dynamically linked to glibc to can't use golang:1.10-alpine -FROM golang:1.10 AS gobuild-base +# protoc is dynamically linked to glibc to can't use golang:1.11-alpine +FROM golang:1.11 AS gobuild-base ARG PROTOC_VERSION=3.1.0 ARG GOGO_VERSION=master RUN apt-get update && apt-get install -y \ diff --git a/hack/dockerfiles/lint.Dockerfile b/hack/dockerfiles/lint.Dockerfile index 0ac79a38b9df1..3abb7087d6f39 100644 --- a/hack/dockerfiles/lint.Dockerfile +++ b/hack/dockerfiles/lint.Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.10-alpine +FROM golang:1.11-alpine RUN apk add --no-cache git RUN go get -u gopkg.in/alecthomas/gometalinter.v1 \ && mv /go/bin/gometalinter.v1 /go/bin/gometalinter \ diff --git a/hack/dockerfiles/test.Dockerfile b/hack/dockerfiles/test.Dockerfile index 1bc3a664c4ebd..a40d06f8b047d 100644 --- a/hack/dockerfiles/test.Dockerfile +++ b/hack/dockerfiles/test.Dockerfile @@ -10,7 +10,7 @@ ARG ROOTLESSKIT_VERSION=20b0fc24b305b031a61ef1a1ca456aadafaf5e77 # The `buildkitd` stage and the `buildctl` stage are placed here # so that they can be built quickly with legacy DAG-unaware `docker build --target=...` -FROM golang:1.10-alpine AS gobuild-base +FROM golang:1.11-alpine AS gobuild-base RUN apk add --no-cache g++ linux-headers RUN apk add --no-cache git libseccomp-dev make @@ -23,9 +23,15 @@ RUN mkdir .tmp; \ FROM buildkit-base AS buildctl ENV CGO_ENABLED=0 -ARG GOOS=linux RUN go build -ldflags "$(cat .tmp/ldflags) -d" -o /usr/bin/buildctl ./cmd/buildctl +FROM buildkit-base AS buildctl-darwin +ENV CGO_ENABLED=0 +ENV GOOS=darwin +RUN go build -ldflags "$(cat .tmp/ldflags)" -o /usr/bin/buildctl-darwin ./cmd/buildctl +# reset GOOS for legacy builder +ENV GOOS=linux + FROM buildkit-base AS buildkitd ENV CGO_ENABLED=1 RUN go build -installsuffix netgo -ldflags "$(cat .tmp/ldflags) -w -extldflags -static" -tags 'seccomp netgo cgo static_build' -o /usr/bin/buildkitd ./cmd/buildkitd diff --git a/hack/dockerfiles/vendor.Dockerfile b/hack/dockerfiles/vendor.Dockerfile index 8969457228259..2746799d3c088 100644 --- a/hack/dockerfiles/vendor.Dockerfile +++ b/hack/dockerfiles/vendor.Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.10-alpine AS vndr +FROM golang:1.11-alpine AS vndr RUN apk add --no-cache git # NOTE: hack scripts override VNDR_VERSION to a specific revision ARG VNDR_VERSION=master diff --git a/solver/scheduler.go b/solver/scheduler.go index d9ed9c587311f..7fe981eff4547 100644 --- a/solver/scheduler.go +++ b/solver/scheduler.go @@ -371,7 +371,7 @@ func debugSchedulerPreUnpark(e *edge, inc []pipe.Sender, updates, allPipes []pip if dep.req != nil { des = dep.req.Request().(*edgeRequest).desiredState } - logrus.Debugf(":: dep%d %s state=%s des=%s keys=%s hasslowcache=%v", i, e.edge.Vertex.Inputs()[i].Vertex.Name(), dep.state, des, len(dep.keys), e.slowCacheFunc(dep) != nil) + logrus.Debugf(":: dep%d %s state=%s des=%s keys=%d hasslowcache=%v", i, e.edge.Vertex.Inputs()[i].Vertex.Name(), dep.state, des, len(dep.keys), e.slowCacheFunc(dep) != nil) } for i, in := range inc {