builder-next: avoid double unmounting mountable

tonistiigi · tonistiigi · commit fd7732e16381 · 2019-08-15T22:45:08.000-07:00
Signed-off-by: Tonis Tiigi &lt;tonistiigi@gmail.com&gt;
(cherry picked from commit 9ea2cf320ad2687a51aea1ed849f86f465cbc1d9)
Upstream-commit: cad2cd71b785c27789a55edc9a6450fc4503b01b
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`