Don't link the shell to the shim in detached mode

In case our runtime is used in standalone mode with the --detach
flag enabled, we should not get any output on the current shell.
We should still be able to get some outputs if a console has been
provided.

This patch relies on the latest virtcontainers vendoring to be
able to indicate if we are in case of a detached command or not.

Fixes #326

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>

create.go

@@ -78,12 +78,13 @@ var createCLICommand = cli.Command{
 			context.String("bundle"),
 			console,
 			context.String("pid-file"),
+			false,
 			runtimeConfig,
 		)
 	},
 }
 
-func create(containerID, bundlePath, console, pidFilePath string,
+func create(containerID, bundlePath, console, pidFilePath string, detach bool,
 	runtimeConfig oci.RuntimeConfig) error {
 	var err error
 
@@ -106,12 +107,12 @@ func create(containerID, bundlePath, console, pidFilePath string,
 
 	switch containerType {
 	case vc.PodSandbox:
-		process, err = createPod(ociSpec, runtimeConfig, containerID, bundlePath, console)
+		process, err = createPod(ociSpec, runtimeConfig, containerID, bundlePath, console, detach)
 		if err != nil {
 			return err
 		}
 	case vc.PodContainer:
-		process, err = createContainer(ociSpec, containerID, bundlePath, console)
+		process, err = createContainer(ociSpec, containerID, bundlePath, console, detach)
 		if err != nil {
 			return err
 		}
@@ -144,7 +145,7 @@ func create(containerID, bundlePath, console, pidFilePath string,
 }
 
 func createPod(ociSpec oci.CompatOCISpec, runtimeConfig oci.RuntimeConfig,
-	containerID, bundlePath, console string) (vc.Process, error) {
+	containerID, bundlePath, console string, detach bool) (vc.Process, error) {
 
 	ccKernelParams := []vc.Param{
 		{
@@ -175,7 +176,7 @@ func createPod(ociSpec oci.CompatOCISpec, runtimeConfig oci.RuntimeConfig,
 		}
 	}
 
-	podConfig, err := oci.PodConfig(ociSpec, runtimeConfig, bundlePath, containerID, console, false)
+	podConfig, err := oci.PodConfig(ociSpec, runtimeConfig, bundlePath, containerID, console, detach)
 	if err != nil {
 		return vc.Process{}, err
 	}
@@ -194,9 +195,9 @@ func createPod(ociSpec oci.CompatOCISpec, runtimeConfig oci.RuntimeConfig,
 }
 
 func createContainer(ociSpec oci.CompatOCISpec, containerID, bundlePath,
-	console string) (vc.Process, error) {
+	console string, detach bool) (vc.Process, error) {
 
-	contConfig, err := oci.ContainerConfig(ociSpec, bundlePath, containerID, console, false)
+	contConfig, err := oci.ContainerConfig(ociSpec, bundlePath, containerID, console, detach)
 	if err != nil {
 		return vc.Process{}, err
 	}

exec.go

@@ -240,6 +240,7 @@ func execute(context *cli.Context) error {
 		User:        params.ociProcess.User.Username,
 		Interactive: params.ociProcess.Terminal,
 		Console:     consolePath,
+		Detach:      params.detach,
 	}
 
 	_, _, process, err := vc.EnterContainer(podID, params.cID, cmd)

run.go

@@ -86,7 +86,7 @@ func run(containerID, bundle, console, consoleSocket, pidFile string, detach boo
 		return err
 	}
 
-	if err := create(containerID, bundle, consolePath, pidFile, runtimeConfig); err != nil {
+	if err := create(containerID, bundle, consolePath, pidFile, detach, runtimeConfig); err != nil {
 		return err
 	}