3 files changed, 128 insertions, 2 deletions
diff --git a/cmd/kpod/main.go b/cmd/kpod/main.go
index 97d942a3c..a4bb12475 100644
--- a/cmd/kpod/main.go
+++ b/cmd/kpod/main.go
@@ -57,6 +57,7 @@ func main() {
 		rmiCommand,
 		runCommand,
 		saveCommand,
+		startCommand,
 		statsCommand,
 		stopCommand,
 		tagCommand,
diff --git a/cmd/kpod/spec.go b/cmd/kpod/spec.go
index b19d4d33a..8d9189a0d 100644
--- a/cmd/kpod/spec.go
+++ b/cmd/kpod/spec.go
@@ -319,8 +319,8 @@ func (c *createConfig) CreateBlockIO() (spec.LinuxBlockIO, error) {
 // GetAnnotations returns the all the annotations for the container
 func (c *createConfig) GetAnnotations() map[string]string {
 	a := getDefaultAnnotations()
-	// TODO
-	// Which annotations do we want added by default
+	// TODO - Which annotations do we want added by default
+	// TODO - This should be added to the DB long term
 	if c.tty {
 		a["io.kubernetes.cri-o.TTY"] = "true"
 	}
diff --git a/cmd/kpod/start.go b/cmd/kpod/start.go
new file mode 100644
index 000000000..7f9918fa2
--- /dev/null
+++ b/cmd/kpod/start.go
@@ -0,0 +1,125 @@
+package main
+
+import (
+	"fmt"
+	"sync"
+
+	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
+	"github.com/urfave/cli"
+	"os"
+	"strconv"
+)
+
+var (
+	startFlags = []cli.Flag{
+		cli.BoolFlag{
+			Name:  "attach, a",
+			Usage: "Attach container's STDOUT and STDERR",
+		},
+		cli.StringFlag{
+			Name:  "detach-keys",
+			Usage: "Override the key sequence for detaching a container. Format is a single character [a-Z] or ctrl-<value> where <value> is one of: a-z, @, ^, [, , or _.",
+		},
+		cli.BoolFlag{
+			Name:  "interactive, i",
+			Usage: "Keep STDIN open even if not attached",
+		},
+	}
+	startDescription = `
+   kpod start
+
+   Starts one or more containers.  The container name or ID can be used.
+`
+
+	startCommand = cli.Command{
+		Name:        "start",
+		Usage:       "Start one or more containers",
+		Description: startDescription,
+		Flags:       startFlags,
+		Action:      startCmd,
+		ArgsUsage:   "CONTAINER-NAME [CONTAINER-NAME ...]",
+	}
+)
+
+func startCmd(c *cli.Context) error {
+	args := c.Args()
+	if len(args) < 1 {
+		return errors.Errorf("you must provide at least one container name or id")
+	}
+
+	attach := c.Bool("attach")
+
+	if len(args) > 1 && attach {
+		return errors.Errorf("you cannot start and attach multiple containers at once")
+	}
+
+	if err := validateFlags(c, startFlags); err != nil {
+		return err
+	}
+
+	runtime, err := getRuntime(c)
+	if err != nil {
+		return errors.Wrapf(err, "error creating libpod runtime")
+	}
+	defer runtime.Shutdown(false)
+
+	var lastError error
+	for _, container := range args {
+		// Create a bool channel to track that the console socket attach
+		// is successful.
+		attached := make(chan bool)
+		// Create a waitgroup so we can sync and wait for all goroutines
+		// to finish before exiting main
+		var wg sync.WaitGroup
+
+		ctr, err := runtime.LookupContainer(container)
+		if err != nil {
+			if lastError != nil {
+				fmt.Fprintln(os.Stderr, lastError)
+			}
+			lastError = errors.Wrapf(err, "unable to find container %s", container)
+			continue
+		}
+
+		// We can only be interactive if both the config and the command-line say so
+		if c.Bool("interactive") && !ctr.Config().Stdin {
+			return errors.Errorf("the container was not created with the interactive option")
+		}
+		noStdIn := c.Bool("interactive")
+		tty, err := strconv.ParseBool(ctr.Spec().Annotations["io.kubernetes.cri-o.TTY"])
+		if err != nil {
+			return errors.Wrapf(err, "unable to parse annotations in %s", ctr.ID())
+		}
+		// We only get a terminal session if both a tty was specified in the spec and
+		// -a on the command-line was given.
+		if attach && tty {
+			// We increment the wg counter because we need to do the attach
+			wg.Add(1)
+			// Attach to the running container
+			go func() {
+				logrus.Debug("trying to attach to the container %s", ctr.ID())
+				defer wg.Done()
+				if err := ctr.Attach(noStdIn, c.String("detach-keys"), attached); err != nil {
+					logrus.Errorf("unable to attach to container %s: %q", ctr.ID(), err)
+				}
+			}()
+			if !<-attached {
+				return errors.Errorf("unable to attach to container %s", ctr.ID())
+			}
+		}
+		err = ctr.Start()
+		if err != nil {
+			if lastError != nil {
+				fmt.Fprintln(os.Stderr, lastError)
+			}
+			lastError = errors.Wrapf(err, "unable to start %s", container)
+			continue
+		}
+		if !attach {
+			fmt.Println(ctr.ID())
+		}
+		wg.Wait()
+	}
+	return lastError
+}