Skip to content

Commit 9143272

Browse files
committed
WIP: remove buildkit as dependency
We are only using these: tree vendor/github.com/moby/buildkit vendor/github.com/moby/buildkit ├── AUTHORS ├── LICENSE ├── frontend │ └── dockerfile │ └── dockerignore │ └── dockerignore.go └── util ├── appcontext │ ├── appcontext.go │ ├── appcontext_unix.go │ ├── appcontext_windows.go │ └── register.go └── bklog └── log.go 6 directories, 8 files Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 parent 4f67ff8 commit 9143272

File tree

12 files changed

+6
-278
lines changed

12 files changed

+6
-278
lines changed

cli/command/image/build/dockerignore.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"os"
55
"path/filepath"
66

7-
"github.com/moby/buildkit/frontend/dockerfile/dockerignore"
7+
"github.com/docker/cli/cli/command/image/build/dockerignore"
88
"github.com/moby/patternmatcher"
99
)
1010

vendor/github.com/moby/buildkit/frontend/dockerfile/dockerignore/dockerignore.go renamed to cli/command/image/build/dockerignore/dockerignore.go

File renamed without changes.

vendor/github.com/moby/buildkit/util/appcontext/appcontext.go renamed to cmd/docker/appcontext/appcontext.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ import (
99
"github.com/sirupsen/logrus"
1010
)
1111

12-
var appContextCache context.Context
13-
var appContextOnce sync.Once
12+
var (
13+
appContextCache context.Context
14+
appContextOnce sync.Once
15+
)
1416

1517
// Context returns a static context that reacts to termination signals of the
1618
// running process. Useful in CLI tools.

vendor/github.com/moby/buildkit/util/appcontext/appcontext_unix.go renamed to cmd/docker/appcontext/appcontext_unix.go

File renamed without changes.

vendor/github.com/moby/buildkit/util/appcontext/appcontext_windows.go renamed to cmd/docker/appcontext/appcontext_windows.go

File renamed without changes.

vendor/github.com/moby/buildkit/util/appcontext/register.go renamed to cmd/docker/appcontext/register.go

File renamed without changes.

cmd/docker/docker.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313
"github.com/docker/cli/cli/command/commands"
1414
cliflags "github.com/docker/cli/cli/flags"
1515
"github.com/docker/cli/cli/version"
16+
"github.com/docker/cli/cmd/docker/appcontext"
1617
"github.com/docker/docker/api/types/versions"
17-
"github.com/moby/buildkit/util/appcontext"
1818
"github.com/pkg/errors"
1919
"github.com/sirupsen/logrus"
2020
"github.com/spf13/cobra"

vendor.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ require (
2222
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
2323
github.com/mattn/go-runewidth v0.0.14
2424
github.com/mitchellh/mapstructure v1.3.2
25-
github.com/moby/buildkit v0.11.6
2625
github.com/moby/patternmatcher v0.5.0
2726
github.com/moby/swarmkit/v2 v2.0.0-20230707182847-6f78b8199b05
2827
github.com/moby/sys/sequential v0.5.0

vendor.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,6 @@ github.com/miekg/pkcs11 v1.1.1/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WT
271271
github.com/mitchellh/mapstructure v1.0.0/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
272272
github.com/mitchellh/mapstructure v1.3.2 h1:mRS76wmkOn3KkKAyXDu42V+6ebnXWIztFSYGN7GeoRg=
273273
github.com/mitchellh/mapstructure v1.3.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
274-
github.com/moby/buildkit v0.11.6 h1:VYNdoKk5TVxN7k4RvZgdeM4GOyRvIi4Z8MXOY7xvyUs=
275-
github.com/moby/buildkit v0.11.6/go.mod h1:GCqKfHhz+pddzfgaR7WmHVEE3nKKZMMDPpK8mh3ZLv4=
276274
github.com/moby/patternmatcher v0.5.0 h1:YCZgJOeULcxLw1Q+sVR636pmS7sPEn1Qo2iAN6M7DBo=
277275
github.com/moby/patternmatcher v0.5.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
278276
github.com/moby/swarmkit/v2 v2.0.0-20230707182847-6f78b8199b05 h1:lvMq6zHXnGp6i+6iYDs1Uw9Q5bqiAYd6Sz08hZoxSmY=

vendor/github.com/moby/buildkit/AUTHORS

Lines changed: 0 additions & 66 deletions
This file was deleted.

0 commit comments

Comments
 (0)