Skip to content

Commit

Permalink
Merge pull request #1591 from openshift-cherrypick-robot/cherry-pick-…
Browse files Browse the repository at this point in the history
…1569-to-release-v0.13

[release-v0.13] Do not set dockerfile parameter to an empty string to align with behavior of alpha controller
  • Loading branch information
openshift-merge-bot[bot] authored May 5, 2024
2 parents 40e8aa7 + 2f8c51b commit 30fcfbe
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/apis/build/v1beta1/build_conversion.go
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ func (dest *BuildSpec) ConvertFrom(orig *v1alpha1.BuildSpec) error {
}

//handle spec.Dockerfile migration
if orig.Dockerfile != nil {
if orig.Dockerfile != nil && *orig.Dockerfile != "" {
dockerfileParam := ParamValue{
Name: "dockerfile",
SingleValue: &SingleValue{
Expand Down

0 comments on commit 30fcfbe

Please sign in to comment.