Merge pull request #444 from thaJeztah/19.03_backport_fix_unmount_ipc_ignore_enotexist

thaJeztah · web-flow · commit c094d5a10c11 · 2020-01-23T20:23:02.000+01:00
[19.03 backport] Fix "no such file or directory" warning when unmounting IPC mount
Upstream-commit: 6def98ee7d995a121d6aa27655b458944565ae45
Component: engine
diff --git a/components/engine/container/container_unix.go b/components/engine/container/container_unix.go
@@ -190,7 +190,7 @@ func (container *Container) UnmountIpcMount() error {
 	if shmPath == "" {
 		return nil
 	}
-	if err = mount.Unmount(shmPath); err != nil && !os.IsNotExist(err) {
+	if err = mount.Unmount(shmPath); err != nil && !os.IsNotExist(errors.Cause(err)) {
 		return err
 	}
 	return nil

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ func (container *Container) UnmountIpcMount() error {`
`190`	`190`	`if shmPath == "" {`
`191`	`191`	`return nil`
`192`	`192`	`}`
`193`		`- if err = mount.Unmount(shmPath); err != nil && !os.IsNotExist(err) {`
	`193`	`+ if err = mount.Unmount(shmPath); err != nil && !os.IsNotExist(errors.Cause(err)) {`
`194`	`194`	`return err`
`195`	`195`	`}`
`196`	`196`	`return nil`