Fix handling of legacy parameters

shipwright-io · Oct 18, 2023 · 7ce6db1 · 7ce6db1
1 parent ac9c985
commit 7ce6db1
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/pkg/apis/build/v1beta1/buildstrategy_conversion.go b/pkg/apis/build/v1beta1/buildstrategy_conversion.go
@@ -114,13 +114,13 @@ func (src *BuildStrategySpec) ConvertTo(bs *v1alpha1.BuildStrategySpec) {
 			}
 
 			for argIndex, arg := range buildStep.Args {
-				if strings.Contains(arg, "$(params.dockerfile)") {
+				if strings.Contains(arg, "$(params.builder-image)") {
 					buildStep.Args[argIndex] = strings.ReplaceAll(arg, "$(params.builder-image)", "$(build.builder.image)")
 				}
 			}
 
 			for envIndex, env := range buildStep.Env {
-				if strings.Contains(env.Value, "$(params.dockerfile)") {
+				if strings.Contains(env.Value, "$(params.builder-image)") {
 					buildStep.Env[envIndex].Value = strings.ReplaceAll(env.Value, "$(params.builder-image)", "$(build.builder.image)")
 				}
 			}
@@ -212,7 +212,7 @@ func (src *BuildStrategySpec) ConvertFrom(bs v1alpha1.BuildStrategySpec) {
 			}
 			if strings.Contains(arg, "$(build.builder.image)") {
 				usesBuilderImage = true
-				step.Command[argIndex] = strings.ReplaceAll(arg, "$(build.builder.image)", "$(params.builder-image)")
+				step.Args[argIndex] = strings.ReplaceAll(arg, "$(build.builder.image)", "$(params.builder-image)")
 			}
 		}
 
@@ -227,7 +227,7 @@ func (src *BuildStrategySpec) ConvertFrom(bs v1alpha1.BuildStrategySpec) {
 			}
 			if strings.Contains(env.Value, "$(build.builder.image)") {
 				usesBuilderImage = true
-				step.Command[envIndex] = strings.ReplaceAll(env.Value, "$(build.builder.image)", "$(params.builder-image)")
+				step.Env[envIndex].Value = strings.ReplaceAll(env.Value, "$(build.builder.image)", "$(params.builder-image)")
 			}
 		}