publicWagsHome/buildx
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

local controller: make sure removing session when disconnect

Browse Source 
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
This commit is contained in:
Kohei Tokunaga
2023-08-21 14:15:17 +09:00
parent caa83a6d84
commit 4c210a27e9
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
controller/local/controller.go
View File

@@ -21,7 +21,6 @@ import (
func NewLocalBuildxController(ctx context.Context, dockerCli command.Cli, logger progress.SubLogger) control.BuildxController { func NewLocalBuildxController(ctx context.Context, dockerCli command.Cli, logger progress.SubLogger) control.BuildxController {
return &localController{ return &localController{
dockerCli: dockerCli, dockerCli: dockerCli,
ref: "local",
processes: processes.NewManager(), processes: processes.NewManager(),
} }
} }
@@ -48,6 +47,7 @@ func (b *localController) Build(ctx context.Context, options controllerapi.Build
} }
defer b.buildOnGoing.Store(false) defer b.buildOnGoing.Store(false)
b.ref = "local"
resp, res, buildErr := cbuild.RunBuild(ctx, b.dockerCli, options, in, progress, true) resp, res, buildErr := cbuild.RunBuild(ctx, b.dockerCli, options, in, progress, true)
// NOTE: RunBuild can return *build.ResultHandle even on error. // NOTE: RunBuild can return *build.ResultHandle even on error.
if res != nil { if res != nil {
@@ -121,6 +121,7 @@ func (b *localController) Kill(context.Context) error {
} }
func (b *localController) Close() error { func (b *localController) Close() error {
b.ref = ""
b.cancelRunningProcesses() b.cancelRunningProcesses()
if b.buildConfig.resultCtx != nil { if b.buildConfig.resultCtx != nil {
b.buildConfig.resultCtx.Done() b.buildConfig.resultCtx.Done()
@@ -130,6 +131,9 @@ func (b *localController) Close() error {
} }
func (b *localController) List(ctx context.Context) (res []string, _ error) { func (b *localController) List(ctx context.Context) (res []string, _ error) {
if b.ref == "" {
return nil, nil
}
return []string{b.ref}, nil return []string{b.ref}, nil
} }