a
/
agola
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #111 from sgotti/runconfig_set_default_shell 

runconfig: set task default shell
This commit is contained in:
Simone Gotti 2019-09-12 10:53:08 +02:00 committed by GitHub
parent 512fdb361a 51e9a32db7
commit bbd287845f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/runconfig/runconfig.go
View File

@ -26,6 +26,10 @@ import (
errors "golang.org/x/xerrors" errors "golang.org/x/xerrors"
) )
const (
defaultShell = "/bin/sh -e"
)
func genRuntime(c *config.Config, ce *config.Runtime, variables map[string]string) *rstypes.Runtime { func genRuntime(c *config.Config, ce *config.Runtime, variables map[string]string) *rstypes.Runtime {
containers := []*rstypes.Container{} containers := []*rstypes.Container{}
for _, cc := range ce.Containers { for _, cc := range ce.Containers {
@ -206,6 +210,10 @@ func GenRunConfigTasks(uuid util.UUIDGenerator, c *config.Config, runName string
DockerRegistriesAuth: make(map[string]rstypes.DockerRegistryAuth), DockerRegistriesAuth: make(map[string]rstypes.DockerRegistryAuth),
} }
if t.Shell == "" {
t.Shell = defaultShell
}
if c.DockerRegistriesAuth != nil { if c.DockerRegistriesAuth != nil {
for regname, auth := range c.DockerRegistriesAuth { for regname, auth := range c.DockerRegistriesAuth {
t.DockerRegistriesAuth[regname] = rstypes.DockerRegistryAuth{ t.DockerRegistriesAuth[regname] = rstypes.DockerRegistryAuth{

3
internal/runconfig/runconfig_test.go
View File

@ -801,6 +801,7 @@ func TestGenRunConfig(t *testing.T) {
}, },
}, },
}, },
Shell: "/bin/sh -e",
Environment: map[string]string{ Environment: map[string]string{
"ENV01": "ENV01", "ENV01": "ENV01",
"ENVFROMVARIABLE01": "VARVALUE01", "ENVFROMVARIABLE01": "VARVALUE01",
@ -876,6 +877,7 @@ func TestGenRunConfig(t *testing.T) {
}, },
}, },
}, },
Shell: "/bin/sh -e",
Environment: map[string]string{}, Environment: map[string]string{},
Steps: rstypes.Steps{ Steps: rstypes.Steps{
&rstypes.RunStep{BaseStep: rstypes.BaseStep{Type: "run", Name: "command01"}, Command: "command01", Environment: map[string]string{}}, &rstypes.RunStep{BaseStep: rstypes.BaseStep{Type: "run", Name: "command01"}, Command: "command01", Environment: map[string]string{}},
@ -973,6 +975,7 @@ func TestGenRunConfig(t *testing.T) {
}, },
}, },
}, },
Shell: "/bin/sh -e",
Environment: map[string]string{}, Environment: map[string]string{},
Steps: rstypes.Steps{ Steps: rstypes.Steps{
&rstypes.RunStep{BaseStep: rstypes.BaseStep{Type: "run", Name: "command01"}, Command: "command01", Environment: map[string]string{}}, &rstypes.RunStep{BaseStep: rstypes.BaseStep{Type: "run", Name: "command01"}, Command: "command01", Environment: map[string]string{}},

2
internal/services/executor/executor.go
View File

@ -109,6 +109,8 @@ func (e *Executor) doRunStep(ctx context.Context, s *types.RunStep, t *types.Exe
} }
defer outf.Close() defer outf.Close()
// TODO(sgotti) this line is used only for old runconfig versions that don't
// set a task default shell in the runconfig
shell := defaultShell shell := defaultShell
if t.Shell != "" { if t.Shell != "" {
shell = t.Shell shell = t.Shell