containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use AttachSocketPath when removing conmon files 

Signed-off-by: Peter Hunt <pehunt@redhat.com>
This commit is contained in:
Peter Hunt 2021-01-14 12:26:34 -05:00
parent 35b62ef19f
commit 6708bc235f
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libpod/container_internal.go
View File

@ -685,7 +685,11 @@ func (c *Container) removeIPv4Allocations() error {
// This is necessary for restarting containers // This is necessary for restarting containers
func (c *Container) removeConmonFiles() error { func (c *Container) removeConmonFiles() error {
// Files are allowed to not exist, so ignore ENOENT // Files are allowed to not exist, so ignore ENOENT
attachFile := filepath.Join(c.bundlePath(), "attach") attachFile, err := c.AttachSocketPath()
if err != nil {
return errors.Wrapf(err, "failed to get attach socket path for container %s", c.ID())
}
if err := os.Remove(attachFile); err != nil && !os.IsNotExist(err) { if err := os.Remove(attachFile); err != nil && !os.IsNotExist(err) {
return errors.Wrapf(err, "error removing container %s attach file", c.ID()) return errors.Wrapf(err, "error removing container %s attach file", c.ID())
} }