kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Remove unused Builder.Cancel()

Browse source 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2017-04-11 14:06:51 -04:00
parent a6abd57b83
commit 068f344e03
1 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
builder/dockerfile/builder.go
View file

@ -50,7 +50,6 @@ type Builder struct {
docker builder.Backend docker builder.Backend
context builder.Context context builder.Context
clientCtx context.Context clientCtx context.Context
cancel context.CancelFunc
runConfig *container.Config // runconfig for cmd, run, entrypoint etc. runConfig *container.Config // runconfig for cmd, run, entrypoint etc.
flags *BFlags flags *BFlags
@ -113,10 +112,8 @@ func NewBuilder(clientCtx context.Context, config *types.ImageBuildOptions, back
if config == nil { if config == nil {
config = new(types.ImageBuildOptions) config = new(types.ImageBuildOptions)
} }
ctx, cancel := context.WithCancel(clientCtx)
b = &Builder{ b = &Builder{
clientCtx: ctx, clientCtx: clientCtx,
cancel: cancel,
options: config, options: config,
Stdout: os.Stdout, Stdout: os.Stdout,
Stderr: os.Stderr, Stderr: os.Stderr,
@ -313,11 +310,6 @@ func (b *Builder) hasFromImage() bool {
return b.image != "" || b.noBaseImage return b.image != "" || b.noBaseImage
} }
// Cancel cancels an ongoing Dockerfile build.
func (b *Builder) Cancel() {
b.cancel()
}
// BuildFromConfig builds directly from `changes`, treating it as if it were the contents of a Dockerfile // BuildFromConfig builds directly from `changes`, treating it as if it were the contents of a Dockerfile
// It will: // It will:
// - Call parse.Parse() to get an AST root for the concatenated Dockerfile entries. // - Call parse.Parse() to get an AST root for the concatenated Dockerfile entries.