docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-07-10 05:27:07 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #32 from tonistiigi/rm

Browse Source 
rm: remove builder even if driver is not responsive
This commit is contained in:
Tõnis Tiigi
2019-04-17 23:08:17 -07:00
committed by GitHub
parent 2ad963bcb1 6eeb21f87e
commit 2b7ed4f4eb
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
commands/rm.go
View File

@ -27,10 +27,11 @@ func runRm(dockerCli command.Cli, in rmOptions, args []string) error {
if err != nil { if err != nil {
return err return err
} }
if err := stop(ctx, dockerCli, ng, true); err != nil { err1 := stop(ctx, dockerCli, ng, true)
if err := txn.Remove(ng.Name); err != nil {
return err return err
} }
return txn.Remove(ng.Name) return err1
} }
ng, err := getCurrentInstance(txn, dockerCli) ng, err := getCurrentInstance(txn, dockerCli)
@ -38,10 +39,11 @@ func runRm(dockerCli command.Cli, in rmOptions, args []string) error {
return err return err
} }
if ng != nil { if ng != nil {
if err := stop(ctx, dockerCli, ng, true); err != nil { err1 := stop(ctx, dockerCli, ng, true)
if err := txn.Remove(ng.Name); err != nil {
return err return err
} }
return txn.Remove(ng.Name) return err1
} }
return nil return nil