bug: allow multiple run command and use bash -c (#720)

fix run Signed-off-by: Jinjing.Zhou <allenzhou@tensorchord.ai>
tensorchord · Aug 3, 2022 · f22b283 · f22b283
1 parent da8feb7
commit f22b283
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/pkg/lang/ir/consts.go b/pkg/lang/ir/consts.go
@@ -16,7 +16,7 @@ package ir
 
 const (
  osDefault = "ubuntu20.04"
- languageDefault = "python"
+ languageDefault = "python3"
  pypiIndexModeAuto = "auto"
 
  // used inside the container

diff --git a/pkg/lang/ir/interface.go b/pkg/lang/ir/interface.go
@@ -142,7 +142,7 @@ func RStudioServer() error {
 
 func Run(commands []string) error {
  // TODO(gaocegege): Support order-based exec.
- DefaultGraph.Exec = commands
+ DefaultGraph.Exec = append(DefaultGraph.Exec, commands...)
  return nil
 }
 

diff --git a/pkg/lang/ir/system.go b/pkg/lang/ir/system.go
@@ -47,13 +47,14 @@ func (g Graph) compileRun(root llb.State) llb.State {
  return root
  }
  root = root.AddEnv("PATH", "$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/conda/bin:/usr/local/julia/bin:/opt/conda/envs/envd/bin")
+ logrus.Debugf("compile run: %s", strings.Join(g.Exec, " "))
  if len(g.Exec) == 1 {
- return root.Run(llb.Shlex(g.Exec[0])).Root()
+ return root.Run(llb.Shlex(fmt.Sprintf("bash -c \"%s\"", g.Exec[0]))).Root()
  }
 
- run := root.Run(llb.Shlex(g.Exec[0]))
+ run := root.Run(llb.Shlex(fmt.Sprintf("bash -c \"%s\"", g.Exec[0])))
  for _, c := range g.Exec[1:] {
- run = run.Run(llb.Shlex(c))
+ run = run.Run(llb.Shlex(fmt.Sprintf("bash -c \"%s\"", c)))
  }
  return run.Root()
 }