Merge pull request #327 from tonistiigi/double-unmount-1903

thaJeztah · web-flow · commit 98d54e5c7252 · 2019-08-16T20:30:09.000+02:00
[19.03] builder-next: avoid double unmounting mountable
Upstream-commit: 93c18c73a349fffd067168ab92056d29a67d76a7
Component: engine
diff --git a/components/engine/builder/builder-next/adapters/snapshot/snapshot.go b/components/engine/builder/builder-next/adapters/snapshot/snapshot.go
@@ -480,6 +480,9 @@ func (m *mountable) Release() error {
 	}
 
 	m.mounts = nil
+	defer func() {
+		m.release = nil
+	}()
 	return m.release()
 }
 

Original file line number	Diff line number	Diff line change
`@@ -480,6 +480,9 @@ func (m *mountable) Release() error {`
`480`	`480`	`}`
`481`	`481`
`482`	`482`	`m.mounts = nil`
	`483`	`+ defer func() {`
	`484`	`+ m.release = nil`
	`485`	`+ }()`
`483`	`486`	`return m.release()`
`484`	`487`	`}`
`485`	`488`