Skip to content

Commit

Permalink
WIP: remove buildkit as dependency
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
thaJeztah committed Jul 20, 2023
1 parent 4f67ff8 commit a03454d
Show file tree
Hide file tree
Showing 12 changed files with 6 additions and 343 deletions.
2 changes: 1 addition & 1 deletion cli/command/image/build/dockerignore.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"os"
"path/filepath"

"github.com/moby/buildkit/frontend/dockerfile/dockerignore"
"github.com/docker/cli/cli/command/image/build/dockerignore"
"github.com/moby/patternmatcher"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ import (
"github.com/sirupsen/logrus"
)

var appContextCache context.Context
var appContextOnce sync.Once
var (
appContextCache context.Context
appContextOnce sync.Once
)

// Context returns a static context that reacts to termination signals of the
// running process. Useful in CLI tools.
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion cmd/docker/docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"github.com/docker/cli/cli/command/commands"
cliflags "github.com/docker/cli/cli/flags"
"github.com/docker/cli/cli/version"
"github.com/docker/cli/cmd/docker/appcontext"
"github.com/docker/docker/api/types/versions"
"github.com/moby/buildkit/util/appcontext"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
Expand Down
1 change: 0 additions & 1 deletion vendor.mod
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ require (
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
github.com/mattn/go-runewidth v0.0.14
github.com/mitchellh/mapstructure v1.3.2
github.com/moby/buildkit v0.11.6
github.com/moby/patternmatcher v0.5.0
github.com/moby/swarmkit/v2 v2.0.0-20230707182847-6f78b8199b05
github.com/moby/sys/sequential v0.5.0
Expand Down
2 changes: 0 additions & 2 deletions vendor.sum
Original file line number Diff line number Diff line change
Expand Up @@ -271,8 +271,6 @@ github.com/miekg/pkcs11 v1.1.1/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WT
github.com/mitchellh/mapstructure v1.0.0/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
github.com/mitchellh/mapstructure v1.3.2 h1:mRS76wmkOn3KkKAyXDu42V+6ebnXWIztFSYGN7GeoRg=
github.com/mitchellh/mapstructure v1.3.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
github.com/moby/buildkit v0.11.6 h1:VYNdoKk5TVxN7k4RvZgdeM4GOyRvIi4Z8MXOY7xvyUs=
github.com/moby/buildkit v0.11.6/go.mod h1:GCqKfHhz+pddzfgaR7WmHVEE3nKKZMMDPpK8mh3ZLv4=
github.com/moby/patternmatcher v0.5.0 h1:YCZgJOeULcxLw1Q+sVR636pmS7sPEn1Qo2iAN6M7DBo=
github.com/moby/patternmatcher v0.5.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
github.com/moby/swarmkit/v2 v2.0.0-20230707182847-6f78b8199b05 h1:lvMq6zHXnGp6i+6iYDs1Uw9Q5bqiAYd6Sz08hZoxSmY=
Expand Down
66 changes: 0 additions & 66 deletions vendor/github.com/moby/buildkit/AUTHORS

This file was deleted.

201 changes: 0 additions & 201 deletions vendor/github.com/moby/buildkit/LICENSE

This file was deleted.

This file was deleted.

4 changes: 0 additions & 4 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,6 @@ github.com/miekg/pkcs11
# github.com/mitchellh/mapstructure v1.3.2
## explicit; go 1.14
github.com/mitchellh/mapstructure
# github.com/moby/buildkit v0.11.6
## explicit; go 1.18
github.com/moby/buildkit/frontend/dockerfile/dockerignore
github.com/moby/buildkit/util/appcontext
# github.com/moby/patternmatcher v0.5.0
## explicit; go 1.19
github.com/moby/patternmatcher
Expand Down

0 comments on commit a03454d

Please sign in to comment.