Skip to content

Commit 6ab5961

Browse files
committed
update moby/buildkit (+ buildkit-golang) to be able to finally bump Go version without breaking go mod
1 parent ee641d3 commit 6ab5961

File tree

4 files changed

+64
-2100
lines changed

4 files changed

+64
-2100
lines changed

.config/turbobob.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"builders": [
77
{
88
"name": "default",
9-
"uses": "docker://fn61/buildkit-golang:20240405_0714_856c11bd",
9+
"uses": "docker://fn61/buildkit-golang:20250109_1140_037f68db",
1010
"commands": {
1111
"build": ["build-go-project.sh", "--directory=cmd/bob/", "--binary-basename=bob"],
1212
"dev": ["bash"]

cmd/bob/initguess.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ func parseDockerfile(path string) ([]instructions.Stage, error) {
9494
return nil, err
9595
}
9696

97-
stages, _, err := instructions.Parse(dockerfileAST.AST)
97+
stages, _, err := instructions.Parse(dockerfileAST.AST, nil)
9898
if err != nil {
9999
return nil, err
100100
}

go.mod

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,38 @@
11
module github.com/function61/turbobob
22

3-
go 1.13
3+
go 1.22.0
4+
5+
toolchain go1.23.1
46

57
require (
6-
github.com/cubewise-code/go-mime v0.0.0-20190322015324-9c5316ef3e8e // indirect
8+
al.essio.dev/pkg/shellescape v1.5.1
79
github.com/function61/gokit v0.0.0-20230408192420-6f1204d63c2b
8-
github.com/mattn/go-runewidth v0.0.13 // indirect
9-
github.com/moby/buildkit v0.10.4
10-
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799
11-
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
10+
github.com/moby/buildkit v0.19.0
11+
github.com/opencontainers/image-spec v1.1.0
12+
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
1213
github.com/scylladb/termtables v0.0.0-20191203121021-c4c0b6d42ff4
1314
github.com/spf13/cobra v1.6.1
14-
github.com/spf13/viper v1.10.0 // indirect
1515
go.i3wm.org/i3/v4 v4.18.0
1616
)
17+
18+
require (
19+
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802 // indirect
20+
github.com/BurntSushi/xgbutil v0.0.0-20160919175755-f7c97cef3b4e // indirect
21+
github.com/agext/levenshtein v1.2.3 // indirect
22+
github.com/containerd/typeurl/v2 v2.2.3 // indirect
23+
github.com/docker/go-units v0.5.0 // indirect
24+
github.com/gogo/protobuf v1.3.2 // indirect
25+
github.com/inconshreveable/mousetrap v1.0.1 // indirect
26+
github.com/mattn/go-runewidth v0.0.13 // indirect
27+
github.com/moby/docker-image-spec v1.3.1 // indirect
28+
github.com/opencontainers/go-digest v1.0.0 // indirect
29+
github.com/pkg/errors v0.9.1 // indirect
30+
github.com/pkg/xattr v0.4.4 // indirect
31+
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
32+
github.com/rivo/uniseg v0.2.0 // indirect
33+
github.com/spf13/pflag v1.0.5 // indirect
34+
github.com/tonistiigi/go-csvvalue v0.0.0-20240710180619-ddb21b71c0b4 // indirect
35+
golang.org/x/sync v0.10.0 // indirect
36+
golang.org/x/sys v0.28.0 // indirect
37+
google.golang.org/protobuf v1.35.2 // indirect
38+
)

0 commit comments

Comments
 (0)