From 0fb4c9c5c41d62605f7f4852475e20bf81ffda30 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 --- 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 | 2 +- hack/dockerfiles/vendor.Dockerfile | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) 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..e3a95ec0627d0 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 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