Add support for both 'command' and 'commands'

.dunner.yaml

@@ -5,8 +5,7 @@ build:
       - ["npm", "--version"]
   - image: alpine
     dir: pkg
-    commands:
-    - ["pwd"]
+    command: ["pwd"]
   - image: alpine
     commands:
       - ["apk", "update"]

cmd/version.go

@@ -2,8 +2,9 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/spf13/cobra"
+
 	G "github.com/leopardslab/dunner/pkg/global"
+	"github.com/spf13/cobra"
 )
 
 func init() {

pkg/config/config.go

@@ -30,6 +30,7 @@ type Task struct {
 	Name     string     `yaml:"name"`
 	Image    string     `yaml:"image"`
 	SubDir   string     `yaml:"dir"`
+	Command  []string   `yaml:"command"`
 	Commands [][]string `yaml:"commands"`
 	Envs     []string   `yaml:"envs"`
 	Mounts   []string   `yaml:"mounts"`

pkg/docker/docker.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"io"
 	"io/ioutil"
 	"os"
 	"path/filepath"
@@ -28,6 +29,7 @@ type Step struct {
 	Task      string
 	Name      string
 	Image     string
+	Command   []string
 	Commands  [][]string
 	Env       []string
 	WorkDir   string
@@ -50,6 +52,8 @@ func (step Step) Exec() (*[]Result, error) {
 		hostMountFilepath          = "./"
 		containerDefaultWorkingDir = "/dunner"
 		hostMountTarget            = "/dunner"
+		defaultCommand             = []string{"tail", "-f", "/dev/null"}
+		multipleCommands           = false
 	)
 
 	ctx := context.Background()
@@ -67,7 +71,6 @@ func (step Step) Exec() (*[]Result, error) {
 	}
 
 	log.Infof("Pulling an image: '%s'", step.Image)
-
 	out, err := cli.ImagePull(ctx, step.Image, types.ImagePullOptions{})
 	if err != nil {
 		log.Fatal(err)
@@ -94,11 +97,15 @@ func (step Step) Exec() (*[]Result, error) {
 		containerWorkingDir = filepath.Join(hostMountTarget, step.WorkDir)
 	}
 
+	multipleCommands = len(step.Commands) > 0
+	if !multipleCommands {
+		defaultCommand = step.Command
+	}
 	resp, err := cli.ContainerCreate(
 		ctx,
 		&container.Config{
 			Image:      step.Image,
-			Cmd:        []string{"tail", "-f", "/dev/null"},
+			Cmd:        defaultCommand,
 			Env:        step.Env,
 			WorkingDir: containerWorkingDir,
 		},
@@ -135,14 +142,34 @@ func (step Step) Exec() (*[]Result, error) {
 	}()
 
 	var results []Result
-	for _, cmd := range step.Commands {
-		r, err := runCmd(ctx, cli, resp.ID, cmd)
+	if multipleCommands {
+		for _, cmd := range step.Commands {
+			r, err := runCmd(ctx, cli, resp.ID, cmd)
+			if err != nil {
+				log.Fatal(err)
+			}
+			results = append(results, *r)
+		}
+	} else {
+		statusCh, errCh := cli.ContainerWait(ctx, resp.ID, container.WaitConditionNotRunning)
+		select {
+		case err = <-errCh:
+			if err != nil {
+				log.Fatal(err)
+			}
+		case <-statusCh:
+		}
+
+		out, err := cli.ContainerLogs(ctx, resp.ID, types.ContainerLogsOptions{
+			ShowStdout: true,
+			ShowStderr: true,
+		})
 		if err != nil {
 			log.Fatal(err)
 		}
-		results = append(results, *r)
-	}
 
+		results = []Result{*extractResult(out, step.Command)}
+	}
 	return &results, nil
 }
 
@@ -166,14 +193,19 @@ func runCmd(ctx context.Context, cli *client.Client, containerID string, command
 	}
 	defer resp.Close()
 
+	return extractResult(resp.Reader, command), nil
+}
+
+func extractResult(reader io.Reader, command []string) *Result {
+
 	var out, errOut bytes.Buffer
-	if _, err = stdcopy.StdCopy(&out, &errOut, resp.Reader); err != nil {
+	if _, err := stdcopy.StdCopy(&out, &errOut, reader); err != nil {
 		log.Fatal(err)
 	}
 	var result = Result{
 		Command: strings.Join(command, " "),
 		Output:  out.String(),
 		Error:   errOut.String(),
 	}
-	return &result, nil
+	return &result
 }

pkg/dunner/dunner.go

@@ -46,6 +46,7 @@ func execTask(configs *config.Configs, taskName string, args []string) {
 			Task:     taskName,
 			Name:     stepDefinition.Name,
 			Image:    stepDefinition.Image,
+			Command:  stepDefinition.Command,
 			Commands: stepDefinition.Commands,
 			Env:      stepDefinition.Envs,
 			WorkDir:  stepDefinition.SubDir,