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

Merge pull request #32 from tonistiigi/rm

Browse Source 
rm: remove builder even if driver is not responsive
pull/34/head
Tõnis Tiigi 6 years ago committed by GitHub
parent 2ad963bcb1 6eeb21f87e
commit 2b7ed4f4eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File

10
commands/rm.go
Unescape Escape 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

Write Preview
Loading…
Cancel
Save