Merge pull request #174 from nalind/env-dederp

openshift-merge-robot · web-flow · commit 3733e4752cf5 · 2020-08-03T15:33:02.000-04:00
Fix accidentally discarding the environment for ENV
diff --git a/dispatchers.go b/dispatchers.go
@@ -85,7 +85,7 @@ func env(b *Builder, args []string, attributes map[string]bool, flagArgs []strin
 		// value ==> args[j+1]
 		newVar := []string{args[j] + "=" + args[j+1]}
 		b.RunConfig.Env = mergeEnv(b.RunConfig.Env, newVar)
-		b.Env = mergeEnv(b.RunConfig.Env, newVar)
+		b.Env = mergeEnv(b.Env, newVar)
 		j++
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ func env(b *Builder, args []string, attributes map[string]bool, flagArgs []strin`
`85`	`85`	`// value ==> args[j+1]`
`86`	`86`	`newVar := []string{args[j] + "=" + args[j+1]}`
`87`	`87`	`b.RunConfig.Env = mergeEnv(b.RunConfig.Env, newVar)`
`88`		`- b.Env = mergeEnv(b.RunConfig.Env, newVar)`
	`88`	`+ b.Env = mergeEnv(b.Env, newVar)`
`89`	`89`	`j++`
`90`	`90`	`}`
`91`	`91`