foomo/squadron
1
0
Fork 0
mirror of https://github.com/foomo/squadron.git synced 2025-10-16 12:35:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

shell support for bash and zsh when running a build

Browse Source
This commit is contained in:
Jan Halfar 2021-02-16 15:28:08 +01:00
parent d37b952b4e
commit ada2c6025e
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
squadron.go
View File

@ -332,13 +332,22 @@ func (sq Squadron) Build(s Service) (string, error) {
if s.Build.Command == "" {
return "", ErrBuildNotConfigured
}
args := strings.Split(s.Build.Command, " ")
if args[0] == "docker" && s.Build.Image != "" && s.Build.Tag != "" {
image := fmt.Sprintf("%v:%v", s.Build.Image, s.Build.Tag)
args = append(strings.Split(s.Build.Command, " "), "-t", image)
args := []string{}
shell := "/bin/bash"
for _, envVarName := range []string{"SHELL", "SQUADRON_SHELL"} {
if os.Getenv(envVarName) != "" {
shell = os.Getenv(envVarName)
}
return util.NewCommand(sq.l, args[0]).Args(args[1:]...).Cwd(sq.basePath).Run()
}
switch filepath.Base(shell) {
case "bash":
args = []string{"-c"}
case "zsh":
args = []string{"-c"}
}
args = append(args, s.Build.Command)
return util.NewCommand(sq.l, shell).Args(args...).Cwd(sq.basePath).Run()
}
func (sq Squadron) Push(s Service) (string, error) {