[merge] pull request #1139

manifest/process.go

@@ -90,7 +90,7 @@ func NewProcess(app string, s Service, m Manifest) Process {
 	args = append(args, s.Tag(app))
 
 	if s.Command.String != "" {
-		args = append(args, s.Command.String)
+		args = append(args, "sh", "-c", s.Command.String)
 	} else if len(s.Command.Array) > 0 {
 		args = append(args, s.Command.Array...)
 	}

manifest/process_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestNewProcess(t *testing.T) {
+func TestProcessNew(t *testing.T) {
 	s := manifest.Service{
 		Name: "foo",
 		Volumes: []string{
@@ -44,3 +44,41 @@ func TestNewProcess(t *testing.T) {
 	assert.Equal(t, p.Name, "api-foo")
 	assert.Equal(t, p.Args, expectedArgs)
 }
+
+func TestProcessCommandString(t *testing.T) {
+	s := manifest.Service{
+		Name:    "foo",
+		Command: manifest.Command{String: "ls -la"},
+	}
+
+	m := manifest.Manifest{
+		Services: map[string]manifest.Service{
+			"foo": s,
+		},
+	}
+
+	p := manifest.NewProcess("api", s, m)
+
+	if assert.NotNil(t, p) {
+		assert.Equal(t, []string{"-i", "--rm", "--name", "api-foo", "api/foo", "sh", "-c", "ls -la"}, p.Args)
+	}
+}
+
+func TestProcessStringArray(t *testing.T) {
+	s := manifest.Service{
+		Name:    "foo",
+		Command: manifest.Command{Array: []string{"ls", "-la"}},
+	}
+
+	m := manifest.Manifest{
+		Services: map[string]manifest.Service{
+			"foo": s,
+		},
+	}
+
+	p := manifest.NewProcess("api", s, m)
+
+	if assert.NotNil(t, p) {
+		assert.Equal(t, []string{"-i", "--rm", "--name", "api-foo", "api/foo", "ls", "-la"}, p.Args)
+	}
+}