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

Merge pull request #676 from tonistiigi/vol-delete

Browse Source 
don't error on deleting old build containers without state volume
This commit is contained in:
Tõnis Tiigi 2021-07-16 12:37:37 -07:00 committed by GitHub
commit d9ee3b134c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
driver/docker-container/driver.go
View File

@ -275,15 +275,24 @@ func (d *Driver) Rm(ctx context.Context, force bool, rmVolume bool) error {
return err return err
} }
if info.Status != driver.Inactive { if info.Status != driver.Inactive {
container, err := d.DockerAPI.ContainerInspect(ctx, d.Name)
if err != nil {
return err
}
if err := d.DockerAPI.ContainerRemove(ctx, d.Name, dockertypes.ContainerRemoveOptions{ if err := d.DockerAPI.ContainerRemove(ctx, d.Name, dockertypes.ContainerRemoveOptions{
RemoveVolumes: true, RemoveVolumes: true,
Force: force, Force: force,
}); err != nil { }); err != nil {
return err return err
} }
if rmVolume { for _, v := range container.Mounts {
return d.DockerAPI.VolumeRemove(ctx, d.Name+volumeStateSuffix, false) if v.Name == d.Name+volumeStateSuffix {
if rmVolume {
return d.DockerAPI.VolumeRemove(ctx, d.Name+volumeStateSuffix, false)
}
}
} }
} }
return nil return nil
} }