Resolves #1124: Always scan the repository for provided scripts

Whether the base image provides the scripts or not, the repository can supply override scripts.
Removes the expectation/need of a location specified in the image.

pkg/build/strategies/dockerfile/dockerfile.go

@@ -127,11 +127,8 @@ func (builder *Dockerfile) CreateDockerfile(config *api.Config) error {
 	artifactsDestDir := filepath.Join(getDestination(config), "artifacts")
 	artifactsTar := sanitize(filepath.ToSlash(filepath.Join(defaultDestination, "artifacts.tar")))
 	// hasAllScripts indicates that we blindly trust all scripts are provided in the image scripts dir
-	imageScriptsDir, hasAllScripts := getImageScriptsDir(config)
-	var providedScripts map[string]bool
-	if !hasAllScripts {
-		providedScripts = scanScripts(filepath.Join(config.WorkingDir, builder.uploadScriptsDir))
-	}
+	imageScriptsDir := getImageScriptsDir(config)
+	providedScripts := scanScripts(filepath.Join(config.WorkingDir, builder.uploadScriptsDir))
 
 	if config.Incremental {
 		imageTag := util.FirstNonEmpty(config.IncrementalFromTag, config.Tag)
@@ -424,18 +421,18 @@ func getDestination(config *api.Config) string {
 
 // getImageScriptsDir returns the directory containing the builder image scripts and a bool
 // indicating that the directory is expected to contain all s2i scripts
-func getImageScriptsDir(config *api.Config) (string, bool) {
+func getImageScriptsDir(config *api.Config) string {
 	if strings.HasPrefix(config.ScriptsURL, "image://") {
-		return strings.TrimPrefix(config.ScriptsURL, "image://"), true
+		return strings.TrimPrefix(config.ScriptsURL, "image://")
 	}
 	scriptsURL, _ := util.AdjustConfigWithImageLabels(config)
 	if strings.HasPrefix(scriptsURL, "image://") {
-		return strings.TrimPrefix(scriptsURL, "image://"), true
+		return strings.TrimPrefix(scriptsURL, "image://")
 	}
 	if strings.HasPrefix(config.ImageScriptsURL, "image://") {
-		return strings.TrimPrefix(config.ImageScriptsURL, "image://"), false
+		return strings.TrimPrefix(config.ImageScriptsURL, "image://")
 	}
-	return defaultScriptsDir, false
+	return defaultScriptsDir
 }
 
 // scanScripts returns a map of provided s2i scripts

pkg/build/strategies/dockerfile/dockerfile_test.go

@@ -94,13 +94,10 @@ func TestGetImageScriptsDir(t *testing.T) {
 		},
 	}
 	for _, tc := range cases {
-		output, hasScripts := getImageScriptsDir(tc.Config)
+		output := getImageScriptsDir(tc.Config)
 		if output != tc.ExpectedDir {
 			t.Errorf("Expected image scripts dir %s to be %s", output, tc.ExpectedDir)
 		}
-		if hasScripts != tc.HasAllScripts {
-			t.Errorf("Expected has all scripts indicator:\n%v\nto be: %v", hasScripts, tc.HasAllScripts)
-		}
 	}
 }