cmd: Propage return codes when forwarding to Toolbx on the host

Fixes containers#957

src/cmd/create.go

@@ -115,11 +115,9 @@ func create(cmd *cobra.Command, args []string) error {
 			return errors.New("this is not a toolbox container")
 		}
 
-		if _, err := utils.ForwardToHost(); err != nil {
-			return err
-		}
-
-		return nil
+		cmd.SilenceErrors = true
+		exitCode, err := utils.ForwardToHost()
+		return &exitError{exitCode, err}
 	}
 
 	if cmd.Flag("distro").Changed && cmd.Flag("image").Changed {

src/cmd/enter.go

@@ -80,11 +80,9 @@ func enter(cmd *cobra.Command, args []string) error {
 			return errors.New("this is not a toolbox container")
 		}
 
-		if _, err := utils.ForwardToHost(); err != nil {
-			return err
-		}
-
-		return nil
+		cmd.SilenceErrors = true
+		exitCode, err := utils.ForwardToHost()
+		return &exitError{exitCode, err}
 	}
 
 	var container string

src/cmd/help.go

@@ -43,11 +43,9 @@ func help(cmd *cobra.Command, args []string) error {
 			return errors.New("this is not a toolbox container")
 		}
 
-		if _, err := utils.ForwardToHost(); err != nil {
-			return err
-		}
-
-		return nil
+		cmd.SilenceErrors = true
+		exitCode, err := utils.ForwardToHost()
+		return &exitError{exitCode, err}
 	}
 
 	if err := helpShowManual(args); err != nil {

src/cmd/list.go

@@ -91,11 +91,9 @@ func list(cmd *cobra.Command, args []string) error {
 			return errors.New("this is not a toolbox container")
 		}
 
-		if _, err := utils.ForwardToHost(); err != nil {
-			return err
-		}
-
-		return nil
+		cmd.SilenceErrors = true
+		exitCode, err := utils.ForwardToHost()
+		return &exitError{exitCode, err}
 	}
 
 	lsContainers := true

src/cmd/rm.go

@@ -62,11 +62,9 @@ func rm(cmd *cobra.Command, args []string) error {
 			return errors.New("this is not a toolbox container")
 		}
 
-		if _, err := utils.ForwardToHost(); err != nil {
-			return err
-		}
-
-		return nil
+		cmd.SilenceErrors = true
+		exitCode, err := utils.ForwardToHost()
+		return &exitError{exitCode, err}
 	}
 
 	if rmFlags.deleteAll {

src/cmd/rmi.go

@@ -62,11 +62,9 @@ func rmi(cmd *cobra.Command, args []string) error {
 			return errors.New("this is not a toolbox container")
 		}
 
-		if _, err := utils.ForwardToHost(); err != nil {
-			return err
-		}
-
-		return nil
+		cmd.SilenceErrors = true
+		exitCode, err := utils.ForwardToHost()
+		return &exitError{exitCode, err}
 	}
 
 	if rmiFlags.deleteAll {

src/cmd/rootMigrationPath.go

@@ -53,11 +53,9 @@ func rootRunImpl(cmd *cobra.Command, args []string) error {
 			return errors.New("this is not a toolbox container")
 		}
 
-		if _, err := utils.ForwardToHost(); err != nil {
-			return err
-		}
-
-		return nil
+		cmd.SilenceErrors = true
+		exitCode, err := utils.ForwardToHost()
+		return &exitError{exitCode, err}
 	}
 
 	image, release, err := utils.ResolveImageName("", "", "")

src/cmd/run.go

@@ -89,11 +89,9 @@ func run(cmd *cobra.Command, args []string) error {
 			return errors.New("this is not a toolbox container")
 		}
 
-		if _, err := utils.ForwardToHost(); err != nil {
-			return err
-		}
-
-		return nil
+		cmd.SilenceErrors = true
+		exitCode, err := utils.ForwardToHost()
+		return &exitError{exitCode, err}
 	}
 
 	var defaultContainer bool = true

test/system/104-run.bats

@@ -166,3 +166,12 @@ teardown() {
   assert_line --index 2 "Error: failed to invoke command /etc in container $(get_latest_container_name)"
   assert [ ${#lines[@]} -eq 3 ]
 }
+
+@test "run: Run command exiting with non-zero code in a toolbx from within a toolbx" {
+  create_default_container
+
+  run $TOOLBOX run toolbox run /bin/sh -c "exit 42"
+  assert_failure
+  assert [ $status -eq 42 ]
+  assert_output ""
+}