update Go to 1.11

For consistency with Moby (moby/moby#37358) Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
AkihiroSuda · Sep 14, 2018 · 0fb4c9c · 0fb4c9c
1 parent 67f81f7
commit 0fb4c9c
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
 

diff --git 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