Skip to content

Commit 4733c51

Browse files
crazy-maxcrazy-max
authored
Merge pull request moby#4068 from jedevc/remove-old-build-tags
chore: remove old `no_{oci,containerd}_worker` build tags
2 parents 405f75f + 450245a commit 4733c51

File tree

10 files changed

+33
-49
lines changed

10 files changed

+33
-49
lines changed

‎cmd/buildkitd/main_containerd_worker.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
//go:build (linux && !no_containerd_worker) || (windows && !no_containerd_worker)
2-
// +build linux,!no_containerd_worker windows,!no_containerd_worker
1+
//go:build linux || windows
2+
// +build linux windows
33

44
package main
55

‎cmd/buildkitd/main_oci_worker.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
//go:build linux && !no_oci_worker
2-
// +build linux,!no_oci_worker
1+
//go:build linux
2+
// +build linux
33

44
package main
55

‎examples/buildkit0/buildkit.go

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ type buildOpt struct {
1818
func main() {
1919
var opt buildOpt
2020
flag.BoolVar(&opt.withContainerd, "with-containerd", true, "enable containerd worker")
21-
flag.StringVar(&opt.containerd, "containerd", "v1.2.9", "containerd version")
22-
flag.StringVar(&opt.runc, "runc", "v1.0.0-rc8", "runc version")
21+
flag.StringVar(&opt.containerd, "containerd", "v1.7.2", "containerd version")
22+
flag.StringVar(&opt.runc, "runc", "v1.1.7", "runc version")
2323
flag.Parse()
2424

2525
bk := buildkit(opt)
@@ -63,9 +63,6 @@ func buildkit(opt buildOpt) llb.State {
6363
Run(llb.Shlex("git clone https://github.com/moby/buildkit.git /go/src/github.com/moby/buildkit")).
6464
Dir("/go/src/github.com/moby/buildkit")
6565

66-
buildkitdOCIWorkerOnly := src.
67-
Run(llb.Shlex("go build -o /bin/buildkitd.oci_only -tags no_containerd_worker ./cmd/buildkitd"))
68-
6966
buildkitd := src.
7067
Run(llb.Shlex("go build -o /bin/buildkitd ./cmd/buildkitd"))
7168

@@ -75,11 +72,9 @@ func buildkit(opt buildOpt) llb.State {
7572
r := llb.Image("docker.io/library/alpine:latest")
7673
r = copy(buildctl.Root(), "/bin/buildctl", r, "/bin/")
7774
r = copy(runc(opt.runc), "/usr/bin/runc", r, "/bin/")
75+
r = copy(buildkitd.Root(), "/bin/buildkitd", r, "/bin/")
7876
if opt.withContainerd {
7977
r = copy(containerd(opt.containerd), "/go/src/github.com/containerd/containerd/bin/containerd", r, "/bin/")
80-
r = copy(buildkitd.Root(), "/bin/buildkitd", r, "/bin/")
81-
} else {
82-
r = copy(buildkitdOCIWorkerOnly.Root(), "/bin/buildkitd.oci_only", r, "/bin/")
8378
}
8479
return r
8580
}

‎examples/buildkit1/buildkit.go

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ type buildOpt struct {
1818
func main() {
1919
var opt buildOpt
2020
flag.BoolVar(&opt.withContainerd, "with-containerd", true, "enable containerd worker")
21-
flag.StringVar(&opt.containerd, "containerd", "v1.2.9", "containerd version")
22-
flag.StringVar(&opt.runc, "runc", "v1.0.0-rc8", "runc version")
21+
flag.StringVar(&opt.containerd, "containerd", "v1.7.2", "containerd version")
22+
flag.StringVar(&opt.runc, "runc", "v1.1.7", "runc version")
2323
flag.Parse()
2424

2525
bk := buildkit(opt)
@@ -58,9 +58,6 @@ func containerd(version string) llb.State {
5858
func buildkit(opt buildOpt) llb.State {
5959
src := goBuildBase().With(goFromGit("github.com/moby/buildkit", "master"))
6060

61-
buildkitdOCIWorkerOnly := src.
62-
Run(llb.Shlex("go build -o /bin/buildkitd.oci_only -tags no_containerd_worker ./cmd/buildkitd")).Root()
63-
6461
buildkitd := src.
6562
Run(llb.Shlex("go build -o /bin/buildkitd ./cmd/buildkitd")).Root()
6663

@@ -69,15 +66,16 @@ func buildkit(opt buildOpt) llb.State {
6966

7067
r := llb.Image("docker.io/library/alpine:latest").With(
7168
copyFrom(buildctl, "/bin/buildctl", "/bin/"),
69+
copyFrom(buildkitd, "/bin/buildkitd", "/bin/"),
7270
copyFrom(runc(opt.runc), "/usr/bin/runc", "/bin/"),
7371
)
7472

7573
if opt.withContainerd {
76-
return r.With(
74+
r = r.With(
7775
copyFrom(containerd(opt.containerd), "/go/src/github.com/containerd/containerd/bin/containerd", "/bin/"),
78-
copyFrom(buildkitd, "/bin/buildkitd", "/bin/"))
76+
)
7977
}
80-
return r.With(copyFrom(buildkitdOCIWorkerOnly, "/bin/buildkitd.oci_only", "/bin/"))
78+
return r
8179
}
8280

8381
// goFromGit is a helper for cloning a git repo, checking out a tag and copying

‎examples/buildkit2/buildkit.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ type buildOpt struct {
1818
func main() {
1919
var opt buildOpt
2020
flag.BoolVar(&opt.withContainerd, "with-containerd", true, "enable containerd worker")
21-
flag.StringVar(&opt.containerd, "containerd", "v1.2.9", "containerd version")
22-
flag.StringVar(&opt.runc, "runc", "v1.0.0-rc8", "runc version")
21+
flag.StringVar(&opt.containerd, "containerd", "v1.7.2", "containerd version")
22+
flag.StringVar(&opt.runc, "runc", "v1.1.7", "runc version")
2323
flag.Parse()
2424

2525
bk := buildkit(opt)
@@ -67,23 +67,22 @@ func containerd(version string) llb.State {
6767
func buildkit(opt buildOpt) llb.State {
6868
run := goRepo(goBuildBase(), "github.com/moby/buildkit", "master")
6969

70-
buildkitdOCIWorkerOnly := run(llb.Shlex("go build -o ./bin/buildkitd.oci_only -tags no_containerd_worker ./cmd/buildkitd"))
71-
7270
buildkitd := run(llb.Shlex("go build -o ./bin/buildkitd ./cmd/buildkitd"))
7371

7472
buildctl := run(llb.Shlex("go build -o ./bin/buildctl ./cmd/buildctl"))
7573

7674
r := llb.Image("docker.io/library/alpine:latest").With(
7775
copyAll(buildctl, "/bin"),
76+
copyAll(buildkitd, "/bin"),
7877
copyAll(runc(opt.runc), "/bin"),
7978
)
8079

8180
if opt.withContainerd {
82-
return r.With(
81+
r = r.With(
8382
copyAll(containerd(opt.containerd), "/bin"),
84-
copyAll(buildkitd, "/bin"))
83+
)
8584
}
86-
return r.With(copyAll(buildkitdOCIWorkerOnly, "/bin"))
85+
return r
8786
}
8887

8988
func copyAll(src llb.State, destPath string) llb.StateOption {

‎examples/buildkit3/buildkit.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ type buildOpt struct {
1919
func main() {
2020
var opt buildOpt
2121
flag.BoolVar(&opt.withContainerd, "with-containerd", true, "enable containerd worker")
22-
flag.StringVar(&opt.containerd, "containerd", "v1.2.9", "containerd version")
23-
flag.StringVar(&opt.runc, "runc", "v1.0.0-rc8", "runc version")
22+
flag.StringVar(&opt.containerd, "containerd", "v1.7.2", "containerd version")
23+
flag.StringVar(&opt.runc, "runc", "v1.1.7", "runc version")
2424
flag.StringVar(&opt.buildkit, "buildkit", "master", "buildkit version")
2525
flag.Parse()
2626

@@ -83,23 +83,22 @@ func buildkit(opt buildOpt) llb.State {
8383
}
8484
run := goRepo(goBuildBase(), repo, src)
8585

86-
buildkitdOCIWorkerOnly := run(llb.Shlex("go build -o /out/buildkitd.oci_only -tags no_containerd_worker ./cmd/buildkitd"))
87-
8886
buildkitd := run(llb.Shlex("go build -o /out/buildkitd ./cmd/buildkitd"))
8987

9088
buildctl := run(llb.Shlex("go build -o /out/buildctl ./cmd/buildctl"))
9189

9290
r := llb.Scratch().With(
9391
copyAll(buildctl, "/"),
92+
copyAll(buildkitd, "/"),
9493
copyAll(runc(opt.runc), "/"),
9594
)
9695

9796
if opt.withContainerd {
98-
return r.With(
97+
r = r.With(
9998
copyAll(containerd(opt.containerd), "/"),
100-
copyAll(buildkitd, "/"))
99+
)
101100
}
102-
return r.With(copyAll(buildkitdOCIWorkerOnly, "/"))
101+
return r
103102
}
104103

105104
func copyAll(src llb.State, destPath string) llb.StateOption {

‎examples/buildkit4/buildkit.go

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ type buildOpt struct {
2121
func main() {
2222
var opt buildOpt
2323
flag.BoolVar(&opt.withContainerd, "with-containerd", true, "enable containerd worker")
24-
flag.StringVar(&opt.containerd, "containerd", "v1.5.9", "containerd version")
25-
flag.StringVar(&opt.runc, "runc", "v1.1.0", "runc version")
24+
flag.StringVar(&opt.containerd, "containerd", "v1.7.2", "containerd version")
25+
flag.StringVar(&opt.runc, "runc", "v1.1.7", "runc version")
2626
flag.StringVar(&opt.buildkit, "buildkit", "master", "buildkit version")
2727
flag.StringVar(&opt.installPrefix, "prefix", "/usr/local/bin", "path under which binaries should be installed")
2828
flag.Parse()
@@ -86,21 +86,14 @@ func buildkit(opt buildOpt) llb.State {
8686
}
8787
run := goRepo(goBuildBase(), repo, src)
8888

89-
buildkitdOCIWorkerOnly := prefixed(
90-
run(llb.Shlex("go build -o /out/buildkitd.oci_only -tags no_containerd_worker ./cmd/buildkitd")),
91-
opt.installPrefix,
92-
)
93-
9489
buildkitd := prefixed(run(llb.Shlex("go build -o /out/buildkitd ./cmd/buildkitd")), opt.installPrefix)
9590

9691
buildctl := prefixed(run(llb.Shlex("go build -o /out/buildctl ./cmd/buildctl")), opt.installPrefix)
9792

98-
inputs := []llb.State{buildctl, prefixed(runc(opt.runc), opt.installPrefix)}
93+
inputs := []llb.State{buildctl, buildkitd, prefixed(runc(opt.runc), opt.installPrefix)}
9994

10095
if opt.withContainerd {
10196
inputs = append(inputs, prefixed(containerd(opt.containerd), opt.installPrefix), buildkitd)
102-
} else {
103-
inputs = append(inputs, buildkitdOCIWorkerOnly)
10497
}
10598
return llb.Merge(inputs)
10699
}

‎examples/gobuild/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func run() error {
3636
Source: src,
3737
MountPath: "/go/src/github.com/moby/buildkit",
3838
Pkg: "github.com/moby/buildkit/cmd/buildkitd",
39-
BuildTags: []string{"no_containerd_worker"},
39+
BuildTags: []string{},
4040
})
4141
if err != nil {
4242
return err

‎worker/containerd/containerd_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
//go:build linux && !no_containerd_worker
2-
// +build linux,!no_containerd_worker
1+
//go:build linux
2+
// +build linux
33

44
package containerd
55

‎worker/runc/runc_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
//go:build linux && !no_runc_worker
2-
// +build linux,!no_runc_worker
1+
//go:build linux
2+
// +build linux
33

44
package runc
55

0 commit comments

Comments
 (0)