Restore build args after optimize. Fixes GoogleContainerTools#1910, G…

…oogleContainerTools#1912.
apollo13 · Feb 7, 2022 · 731068f · 731068f
1 parent bde9043
commit 731068f
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/pkg/executor/build.go b/pkg/executor/build.go
@@ -227,6 +227,11 @@ func (s *stageBuilder) optimize(compositeKey CompositeCache, cfg v1.Config) erro
 	if !s.opts.Cache {
 		return nil
 	}
+	var buildArgs = s.args.Clone()
+	// Restore build args back to their original values
+	defer func() {
+		s.args = buildArgs
+	}()
 
 	stopCache := false
 	// Possibly replace commands with their cached implementations.