Revert "fix(stapel): the user cannot use custom LD_LIBRARY_PATH with …

…shell builder" This reverts commit 0fd4f33. Signed-off-by: Alexey Igrychev <alexey.igrychev@flant.com>
werf · Aug 18, 2022 · 194d220 · 194d220
1 parent 6d418b1
commit 194d220
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/build/builder/shell.go b/pkg/build/builder/shell.go
@@ -86,7 +86,7 @@ func (b *Shell) stage(cr container_backend.ContainerBackend, stageBuilder stage_
 			return err
 		}
 
-		container.AddRunCommands(containerTmpScriptFilePath)
+		container.AddServiceRunCommands(containerTmpScriptFilePath)
 	} else {
 		stageBuilder.StapelStageBuilder().AddCommands(b.stageCommands(userStageName)...)
 	}

diff --git a/pkg/stapel/stapel.go b/pkg/stapel/stapel.go
@@ -220,7 +220,7 @@ func CreateScript(path string, commands []string) error {
 	}
 
 	var scriptLines []string
-	scriptLines = append(scriptLines, "#!")
+	scriptLines = append(scriptLines, fmt.Sprintf("#!%s -e", BashBinPath()))
 	scriptLines = append(scriptLines, "")
 	scriptLines = append(scriptLines, commands...)
 	scriptData := []byte(strings.Join(scriptLines, "\n") + "\n")