examples: update the gobuild examples
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>docker-18.09
Tonis Tiigi
parent
20872edc25
commit
34d555906c
|
|
@ -6,7 +6,7 @@ import (
|
|||
"os"
|
||||
|
||||
"github.com/moby/buildkit/client/llb"
|
||||
"github.com/moby/buildkit/examples/gobuilder"
|
||||
gobuild "github.com/tonistiigi/llb-gobuild"
|
||||
)
|
||||
|
||||
func main() {
|
||||
|
|
@ -16,15 +16,57 @@ func main() {
|
|||
}
|
||||
|
||||
func run() error {
|
||||
|
||||
src := llb.Local("src")
|
||||
|
||||
g := gobuilder.New(src)
|
||||
gb := gobuild.New(nil)
|
||||
// gb := gobuild.New(&gobuild.Opt{DevMode: true})
|
||||
|
||||
buildctl, err := gb.BuildExe(gobuild.BuildOpt{
|
||||
Source: src,
|
||||
MountPath: "/go/src/github.com/moby/buildkit",
|
||||
Pkg: "github.com/moby/buildkit/cmd/buildctl",
|
||||
BuildTags: []string{},
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
buildd, err := gb.BuildExe(gobuild.BuildOpt{
|
||||
Source: src,
|
||||
MountPath: "/go/src/github.com/moby/buildkit",
|
||||
Pkg: "github.com/moby/buildkit/cmd/buildd",
|
||||
BuildTags: []string{"standalone"},
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
_ = buildd
|
||||
|
||||
containerd, err := gb.BuildExe(gobuild.BuildOpt{
|
||||
Source: llb.Git("github.com/containerd/containerd", "master"),
|
||||
MountPath: "/go/src/github.com/containerd/containerd",
|
||||
Pkg: "github.com/containerd/containerd/cmd/containerd",
|
||||
BuildTags: []string{"no_btrfs"},
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
runc, err := gb.BuildExe(gobuild.BuildOpt{
|
||||
CgoEnabled: true,
|
||||
Source: llb.Git("github.com/opencontainers/runc", "master"),
|
||||
MountPath: "/go/src/github.com/opencontainers/runc",
|
||||
Pkg: "github.com/opencontainers/runc",
|
||||
BuildTags: []string{},
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
sc := llb.Scratch().
|
||||
// With(copyAll(g.Build("github.com/moby/buildkit/client/llb"), "/"))
|
||||
With(copyAll(g.Build("github.com/moby/buildkit/cmd/buildd"), "/")).
|
||||
With(copyAll(g.Build("github.com/moby/buildkit/cmd/buildctl"), "/"))
|
||||
With(copyAll(*buildctl, "/")).
|
||||
With(copyAll(*containerd, "/")).
|
||||
// With(copyAll(*buildd, "/")).
|
||||
With(copyAll(*runc, "/"))
|
||||
|
||||
dt, err := sc.Marshal()
|
||||
if err != nil {
|
||||
|
|
|
|||
|
|
@ -1,231 +0,0 @@
|
|||
package gobuilder
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"go/build"
|
||||
"os"
|
||||
"path"
|
||||
"path/filepath"
|
||||
"runtime"
|
||||
"sort"
|
||||
"strings"
|
||||
|
||||
"github.com/moby/buildkit/client/llb"
|
||||
"github.com/moby/buildkit/util/system"
|
||||
)
|
||||
|
||||
func New(src llb.State) *Loader {
|
||||
return newLoader(goBuildBase(), src)
|
||||
}
|
||||
|
||||
func (l *Loader) Build(pkg string) llb.State {
|
||||
p, err := l.load(pkg)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
return *p
|
||||
}
|
||||
|
||||
func goBuildBase() llb.State {
|
||||
goAlpine := llb.Image("docker.io/library/golang:1.9-alpine@sha256:e91ddbf20f44daeba9a9eca328bc8dbaccf790d26d017dfc572bc003f556e42d")
|
||||
return goAlpine.
|
||||
AddEnv("CGO_ENABLED", "0").
|
||||
AddEnv("PATH", "/usr/local/go/bin:"+system.DefaultPathEnv).
|
||||
AddEnv("GOPATH", "/go").Run(llb.Shlex("apk add --no-cache gcc libc-dev")).Root()
|
||||
}
|
||||
|
||||
type Loader struct {
|
||||
v *vendorDirs
|
||||
gopath string
|
||||
cache map[string]*pkg
|
||||
bctx build.Context
|
||||
local llb.State
|
||||
base llb.State
|
||||
wd string
|
||||
}
|
||||
|
||||
func newLoader(base, local llb.State) *Loader {
|
||||
gopath := os.Getenv("GOPATH")
|
||||
bctx := build.Context{
|
||||
GOARCH: runtime.GOARCH,
|
||||
GOOS: runtime.GOOS,
|
||||
GOROOT: runtime.GOROOT(),
|
||||
GOPATH: gopath,
|
||||
Compiler: "gc",
|
||||
CgoEnabled: false,
|
||||
BuildTags: []string{"standalone"},
|
||||
ReleaseTags: []string{"go1.1", "go1.2", "go1.3", "go1.4", "go1.5", "go1.6", "go1.7", "go1.8"},
|
||||
}
|
||||
wd, _ := os.Getwd()
|
||||
l := &Loader{
|
||||
v: newVendorDirs(gopath),
|
||||
gopath: gopath,
|
||||
cache: map[string]*pkg{},
|
||||
bctx: bctx,
|
||||
local: local,
|
||||
base: base,
|
||||
wd: wd,
|
||||
}
|
||||
return l
|
||||
}
|
||||
|
||||
func (l *Loader) load(p string) (*llb.State, error) {
|
||||
pkg, err := l.loadDir(filepath.Join(l.gopath, "src", p), true)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &pkg.state, nil
|
||||
}
|
||||
|
||||
func (l *Loader) loadDir(dir string, link bool) (*pkg, error) {
|
||||
if p, ok := l.cache[dir]; ok {
|
||||
return p, nil
|
||||
}
|
||||
p, err := l.bctx.ImportDir(dir, 0)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
l.v.add(filepath.Dir(dir))
|
||||
|
||||
pkg := &pkg{alldeps: map[string]llb.State{}}
|
||||
|
||||
for _, imp := range p.Imports {
|
||||
for _, vd := range l.v.dirs {
|
||||
d := filepath.Join(vd, imp)
|
||||
fi, err := os.Stat(d)
|
||||
if err == nil && fi.IsDir() {
|
||||
p, err := l.loadDir(d, false)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
pkg.AddDep(imp, p)
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
name := p.ImportPath
|
||||
if link {
|
||||
name = p.Name
|
||||
}
|
||||
|
||||
cmd := llb.Shlexf("/usr/local/go/pkg/tool/linux_amd64/compile -o /work/%s.a -trimpath /work -p %s -complete -I /work -pack %s", p.ImportPath, name, strings.Join(p.GoFiles, " "))
|
||||
|
||||
if len(p.SFiles) > 0 {
|
||||
cmd = llb.Shlexf("/usr/local/go/pkg/tool/linux_amd64/compile -o /work/%s.a -trimpath /work -p %s -I /work -pack -asmhdr /work/%s/_obj/go_asm.h %s ", p.ImportPath, name, p.ImportPath, strings.Join(p.GoFiles, " "))
|
||||
|
||||
}
|
||||
|
||||
st := l.base.Run(cmd, llb.Dir("/root"))
|
||||
|
||||
for _, mount := range pkg.mounts {
|
||||
st.AddMount(path.Join("/work", mount.target, mount.selector+".a"), mount.state, llb.SourcePath(mount.selector+".a"), llb.Readonly)
|
||||
}
|
||||
|
||||
for _, f := range p.GoFiles {
|
||||
st.AddMount(path.Join("/root", f), l.local, llb.SourcePath(strings.TrimPrefix(path.Join(dir, f), l.wd)), llb.Readonly)
|
||||
}
|
||||
|
||||
var asmheader llb.State
|
||||
if len(p.SFiles) > 0 {
|
||||
asmheader = st.AddMount(path.Join("/work", p.ImportPath, "_obj"), llb.Scratch())
|
||||
}
|
||||
|
||||
out := st.AddMount(path.Join("/work", path.Dir(p.ImportPath)), llb.Scratch())
|
||||
|
||||
if len(p.SFiles) > 0 {
|
||||
cmd := llb.Shlexf("/usr/local/go/pkg/tool/linux_amd64/asm -I /work/%s/_obj/ -I /usr/local/go/pkg/include -D GOOS_%s -D GOARCH_%s -o /work/%s/_obj/asm_%s_%s.o -trimpath /work %s", p.ImportPath, runtime.GOOS, runtime.GOARCH, p.ImportPath, runtime.GOOS, runtime.GOARCH, strings.Join(p.SFiles, " "))
|
||||
st := l.base.Run(cmd, llb.Dir("/root"))
|
||||
for _, f := range p.SFiles {
|
||||
st.AddMount(path.Join("/root", f), l.local, llb.SourcePath(strings.TrimPrefix(path.Join(dir, f), l.wd)), llb.Readonly)
|
||||
}
|
||||
st.AddMount(path.Join("/work", p.ImportPath, "_obj/go_asm.h"), asmheader, llb.SourcePath("go_asm.h"), llb.Readonly)
|
||||
asmp := st.AddMount(path.Join("/work", p.ImportPath, "_obj"), llb.Scratch())
|
||||
|
||||
cmd = llb.Shlexf("/usr/local/go/pkg/tool/linux_amd64/pack r /work/%s.a /work/%s/_obj/asm_%s_%s.o", p.ImportPath, p.ImportPath, runtime.GOOS, runtime.GOARCH)
|
||||
st2 := l.base.Run(cmd)
|
||||
|
||||
out = st2.AddMount(path.Join("/work", p.ImportPath+".a"), out, llb.SourcePath(path.Base(p.ImportPath)+".a"))
|
||||
st2.AddMount(path.Join("/work", p.ImportPath, fmt.Sprintf("_obj/asm_%s_%s.o", runtime.GOOS, runtime.GOARCH)), asmp, llb.SourcePath(fmt.Sprintf("asm_%s_%s.o", runtime.GOOS, runtime.GOARCH)), llb.Readonly)
|
||||
|
||||
}
|
||||
|
||||
if link {
|
||||
cmd := llb.Shlexf("/usr/local/go/pkg/tool/linux_amd64/link -o /work/%s/_obj/exe/%s -L /work -extld=gcc -extldflags \"-static\" -buildmode=exe /work/%s.a", p.ImportPath, path.Base(p.ImportPath), p.ImportPath)
|
||||
|
||||
st3 := l.base.Run(cmd)
|
||||
st3.AddMount(fmt.Sprintf("/work/%s.a", p.ImportPath), out, llb.SourcePath(path.Base(p.ImportPath)+".a"), llb.Readonly)
|
||||
out = st3.AddMount(fmt.Sprintf("/work/%s/_obj/exe", p.ImportPath), llb.Scratch())
|
||||
|
||||
for s, d := range pkg.alldeps {
|
||||
st3.AddMount(fmt.Sprintf("/work/%s.a", s), d, llb.SourcePath(path.Base(s)+".a"), llb.Readonly)
|
||||
}
|
||||
}
|
||||
|
||||
pkg.state = out
|
||||
|
||||
l.cache[dir] = pkg
|
||||
|
||||
return pkg, err
|
||||
|
||||
}
|
||||
|
||||
type pkg struct {
|
||||
mounts []*mount
|
||||
state llb.State
|
||||
alldeps map[string]llb.State
|
||||
}
|
||||
|
||||
type mount struct {
|
||||
target string
|
||||
selector string
|
||||
state llb.State
|
||||
}
|
||||
|
||||
func (p *pkg) AddDep(name string, dep *pkg) {
|
||||
p.mounts = append(p.mounts, &mount{
|
||||
target: path.Dir(name),
|
||||
selector: path.Base(name),
|
||||
state: dep.state,
|
||||
})
|
||||
for str, d := range dep.alldeps {
|
||||
p.alldeps[str] = d
|
||||
}
|
||||
p.alldeps[name] = dep.state
|
||||
}
|
||||
|
||||
type vendorDirs struct {
|
||||
checkedDirs map[string]struct{}
|
||||
dirs []string
|
||||
gopath string
|
||||
}
|
||||
|
||||
func newVendorDirs(gopath string) *vendorDirs {
|
||||
return &vendorDirs{
|
||||
checkedDirs: map[string]struct{}{},
|
||||
gopath: gopath,
|
||||
dirs: []string{filepath.Join(gopath, "src")},
|
||||
}
|
||||
}
|
||||
|
||||
func (v *vendorDirs) add(d string) {
|
||||
if v.gopath == d {
|
||||
return
|
||||
}
|
||||
if _, ok := v.checkedDirs[d]; ok {
|
||||
return
|
||||
}
|
||||
v.checkedDirs[d] = struct{}{}
|
||||
vd := filepath.Join(d, "vendor")
|
||||
fi, err := os.Stat(vd)
|
||||
if err == nil {
|
||||
if fi.IsDir() {
|
||||
v.dirs = append(v.dirs, vd)
|
||||
sort.Slice(v.dirs, func(a, b int) bool {
|
||||
return v.dirs[a] > v.dirs[b]
|
||||
})
|
||||
}
|
||||
}
|
||||
v.add(filepath.Dir(d))
|
||||
}
|
||||
Loading…
Reference in New Issue