dilim/buildkit
1
0
Fork 0
mirror of https://github.com/moby/buildkit.git synced 2026-08-03 22:30:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

update go to 1.17

Browse Source 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi
2021-08-16 19:56:45 -07:00
parent 124126e751
commit ac61da5890
11 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Dockerfile
View File

@@ -21,18 +21,10 @@ RUN apk add --no-cache git
# xx is a helper for cross-compilation
FROM --platform=$BUILDPLATFORM tonistiigi/xx@sha256:1e96844fadaa2f9aea021b2b05299bc02fe4c39a92d8e735b93e8e2b15610128 AS xx
FROM --platform=$BUILDPLATFORM golang:1.16-alpine AS golatest
FROM golatest AS go-linux
FROM golatest AS go-darwin
FROM golatest AS go-windows-amd64
FROM golatest AS go-windows-386
FROM golatest AS go-windows-arm
FROM --platform=$BUILDPLATFORM golang:1.17beta1-alpine AS go-windows-arm64
FROM go-windows-${TARGETARCH} AS go-windows
FROM --platform=$BUILDPLATFORM golang:1.17-alpine AS golatest
# gobuild is base stage for compiling go/cgo
FROM go-${TARGETOS} AS gobuild-base
FROM golatest AS gobuild-base
RUN apk add --no-cache file bash clang lld pkgconfig git make
COPY --from=xx / /

2
examples/buildkit0/buildkit.go
View File

@@ -33,7 +33,7 @@ func main() {
}
func goBuildBase() llb.State {
goAlpine := llb.Image("docker.io/library/golang:1.16-alpine")
goAlpine := llb.Image("docker.io/library/golang:1.17-alpine")
return goAlpine.
AddEnv("PATH", "/usr/local/go/bin:"+system.DefaultPathEnvUnix).
AddEnv("GOPATH", "/go").

2
examples/buildkit1/buildkit.go
View File

@@ -33,7 +33,7 @@ func main() {
}
func goBuildBase() llb.State {
goAlpine := llb.Image("docker.io/library/golang:1.16-alpine")
goAlpine := llb.Image("docker.io/library/golang:1.17-alpine")
return goAlpine.
AddEnv("PATH", "/usr/local/go/bin:"+system.DefaultPathEnvUnix).
AddEnv("GOPATH", "/go").

2
examples/buildkit2/buildkit.go
View File

@@ -33,7 +33,7 @@ func main() {
}
func goBuildBase() llb.State {
goAlpine := llb.Image("docker.io/library/golang:1.16-alpine")
goAlpine := llb.Image("docker.io/library/golang:1.17-alpine")
return goAlpine.
AddEnv("PATH", "/usr/local/go/bin:"+system.DefaultPathEnvUnix).
AddEnv("GOPATH", "/go").

2
examples/buildkit3/buildkit.go
View File

@@ -34,7 +34,7 @@ func main() {
}
func goBuildBase() llb.State {
goAlpine := llb.Image("docker.io/library/golang:1.16-alpine")
goAlpine := llb.Image("docker.io/library/golang:1.17-alpine")
return goAlpine.
AddEnv("PATH", "/usr/local/go/bin:"+system.DefaultPathEnvUnix).
AddEnv("GOPATH", "/go").

2
examples/nested-llb/main.go
View File

@@ -32,7 +32,7 @@ func main() {
}
func goBuildBase() llb.State {
goAlpine := llb.Image("docker.io/library/golang:1.16-alpine")
goAlpine := llb.Image("docker.io/library/golang:1.17-alpine")
return goAlpine.
AddEnv("PATH", "/usr/local/go/bin:"+system.DefaultPathEnvUnix).
AddEnv("GOPATH", "/go").

2
frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile
View File

@@ -3,7 +3,7 @@
# xx is a helper for cross-compilation
FROM --platform=$BUILDPLATFORM tonistiigi/xx:golang@sha256:810dc54d5144f133a218e88e319184bf8b9ce01d37d46ddb37573e90decd9eef AS xx
FROM --platform=$BUILDPLATFORM golang:1.16-alpine AS base
FROM --platform=$BUILDPLATFORM golang:1.17-alpine AS base
RUN apk add git bash
COPY --from=xx / /
WORKDIR /src

2
hack/dockerfiles/generated-files.Dockerfile
View File

@@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1.3
# protoc is dynamically linked to glibc to can't use golang:1.10-alpine
FROM golang:1.16-buster AS gobuild-base
FROM golang:1.17-buster AS gobuild-base
RUN apt-get update && apt-get --no-install-recommends install -y \
unzip \

2
hack/dockerfiles/lint.Dockerfile
View File

@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1.3
FROM golang:1.16-alpine
FROM golang:1.17-alpine
RUN apk add --no-cache gcc musl-dev yamllint
RUN wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.41.1
WORKDIR /go/src/github.com/moby/buildkit

3
hack/dockerfiles/vendor.Dockerfile
View File

@@ -1,5 +1,6 @@
# syntax = docker/dockerfile:1.3
FROM golang:1.16-alpine AS vendored
FROM golang:1.17-alpine AS vendored
RUN apk add --no-cache git
WORKDIR /src
RUN --mount=target=/src,rw \

2
util/archutil/Dockerfile
View File

@@ -49,7 +49,7 @@ FROM base AS exit-mips64
COPY fixtures/exit.mips64.s .
RUN mips64-linux-gnuabi64-as --noexecstack -o exit.o exit.mips64.s && mips64-linux-gnuabi64-ld -o exit -s exit.o
FROM golang:1.16-alpine AS generate
FROM golang:1.17-alpine AS generate
WORKDIR /src
COPY --from=exit-amd64 /src/exit amd64
COPY --from=exit-386 /src/exit 386