Merge pull request #556 from php-coder/fix_assemble-runtime-path-in-i…

…mage Merged by openshift-bot
openshift · Jul 28, 2016 · 724c0dd · 724c0dd
2 parents 3632461 + 298937f
commit 724c0dd
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/build/strategies/sti/postexecutorstep.go b/pkg/build/strategies/sti/postexecutorstep.go
@@ -250,7 +250,7 @@ func (step *startRuntimeImageAndUploadFilesStep) execute(ctx *postExecutorStepCo
 		return fmt.Errorf("Couldn't get working dir of %q image: %v", image, err)
 	}
 
-	commandBaseDir := workDir
+	commandBaseDir := filepath.Join(workDir, "scripts")
 	useExternalAssembleScript := step.builder.externalScripts[api.AssembleRuntime]
 	if !useExternalAssembleScript {
 		// script already inside of the image
@@ -265,7 +265,7 @@ func (step *startRuntimeImageAndUploadFilesStep) execute(ctx *postExecutorStepCo
 	}
 
 	cmd := fmt.Sprintf(
-		"while [ ! -f %q ]; do sleep 0.5; done; %s/scripts/%s; exit $?",
+		"while [ ! -f %q ]; do sleep 0.5; done; %s/%s; exit $?",
 		lastFileDstPath,
 		commandBaseDir,
 		api.AssembleRuntime,