Merge pull request shipwright-io#58 from shipwright-io/sascha-prevent-empty-dockerfile

Make sure Dockerfile is not set to empty string

Author: openshift-merge-robot

pkg/shp/flags/build.go

@@ -65,4 +65,7 @@ func SanitizeBuildSpec(b *buildv1alpha1.BuildSpec) {
 	if b.Timeout != nil && b.Timeout.Duration == 0 {
 		b.Timeout = nil
 	}
+	if b.Dockerfile != nil && *b.Dockerfile == "" {
+		b.Dockerfile = nil
+	}
 }

pkg/shp/flags/build_test.go

@@ -127,6 +127,8 @@ func TestSanitizeBuildSpec(t *testing.T) {
 		},
 	}
 
+	emptyString := ""
+
 	testCases := []struct {
 		name string
 		in   buildv1alpha1.BuildSpec
@@ -161,6 +163,10 @@ func TestSanitizeBuildSpec(t *testing.T) {
 			Duration: time.Duration(0),
 		}},
 		out: buildv1alpha1.BuildSpec{Timeout: nil},
+	}, {
+		name: "should clean-up an empty Dockerfile",
+		in:   buildv1alpha1.BuildSpec{Dockerfile: &emptyString},
+		out:  buildv1alpha1.BuildSpec{Dockerfile: nil},
 	}}
 
 	for _, tt := range testCases {