Improve the error message when running nested inside a non-Toolbx con…

…tainer Fixes issue #1183 Signed-off-by: Nieves Montero <nmontero@redhat.com>
containers · May 10, 2023 · fcb73d2 · fcb73d2
1 parent 3cfb6bf
commit fcb73d2
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 0 deletions.
diff --git a/src/cmd/root.go b/src/cmd/root.go
@@ -144,6 +144,12 @@ func preRun(cmd *cobra.Command, args []string) error {
 		}
 	}
 
+	logrus.Debugf("Before checking inside a toolbox container")
+	if utils.IsInsideContainer() && !utils.IsInsideToolboxContainer() {
+		logrus.Debugf("Checking if a toolbox container")
+		return createErrorNonToolboxContainer()
+	}
+
 	toolboxPath := os.Getenv("TOOLBOX_PATH")
 
 	if toolboxPath == "" {

diff --git a/src/cmd/utils.go b/src/cmd/utils.go
@@ -138,6 +138,16 @@ func createErrorInvalidRelease(hint string) error {
 	return errors.New(errMsg)
 }
 
+func createErrorNonToolboxContainer() error {
+	var builder strings.Builder
+	fmt.Fprintf(&builder, "this is not a Toolbox container.\n")
+	fmt.Fprintf(&builder, "Toolbox is only meant to work with Toolbox containers.\n")
+	fmt.Fprintf(&builder, "Run '%s --help' for usage.", executableBase)
+
+	errMsg := builder.String()
+	return errors.New(errMsg)
+}
+
 func getUsageForCommonCommands() string {
 	var builder strings.Builder
 	fmt.Fprintf(&builder, "create    Create a new toolbox container\n")

diff --git a/test/system/001-version.bats b/test/system/001-version.bats
@@ -20,6 +20,7 @@ load 'libs/bats-assert/load'
 load 'libs/helpers.bash'
 
 setup() {
+  bats_require_minimum_version 1.5.0
   _setup_environment
 }
 

diff --git a/test/system/002-help.bats b/test/system/002-help.bats
@@ -20,6 +20,7 @@ load 'libs/bats-assert/load'
 load 'libs/helpers.bash'
 
 setup() {
+  bats_require_minimum_version 1.5.0
   _setup_environment
 }
 

diff --git a/test/system/101-create.bats b/test/system/101-create.bats
@@ -20,6 +20,7 @@ load 'libs/bats-assert/load'
 load 'libs/helpers'
 
 setup() {
+  bats_require_minimum_version 1.5.0
   _setup_environment
   cleanup_containers
 }

diff --git a/test/system/103-container.bats b/test/system/103-container.bats
@@ -20,6 +20,7 @@ load 'libs/bats-assert/load'
 load 'libs/helpers'
 
 setup() {
+  bats_require_minimum_version 1.5.0
   _setup_environment
   cleanup_containers
 }

diff --git a/test/system/104-run.bats b/test/system/104-run.bats
@@ -20,6 +20,7 @@ load 'libs/bats-assert/load'
 load 'libs/helpers'
 
 setup() {
+  bats_require_minimum_version 1.5.0
   _setup_environment
   cleanup_containers
 }
@@ -606,6 +607,7 @@ teardown() {
   assert_failure
   assert [ ${#lines[@]} -eq 0 ]
   lines=("${stderr_lines[@]}")
+  echo "${lines[0]}"
   assert_line --index 0 "bash: line 1: exec: $cmd: not found"
   assert_line --index 1 "Error: command $cmd not found in container $(get_latest_container_name)"
   assert [ ${#stderr_lines[@]} -eq 2 ]

diff --git a/test/system/105-enter.bats b/test/system/105-enter.bats
@@ -20,6 +20,7 @@ load 'libs/bats-assert/load'
 load 'libs/helpers'
 
 setup() {
+  bats_require_minimum_version 1.5.0
   _setup_environment
   cleanup_containers
 }

diff --git a/test/system/106-rm.bats b/test/system/106-rm.bats
@@ -20,6 +20,7 @@ load 'libs/bats-assert/load'
 load 'libs/helpers'
 
 setup() {
+  bats_require_minimum_version 1.5.0
   _setup_environment
   cleanup_containers
 }

diff --git a/test/system/107-rmi.bats b/test/system/107-rmi.bats
@@ -20,6 +20,7 @@ load 'libs/bats-assert/load'
 load 'libs/helpers'
 
 setup() {
+  bats_require_minimum_version 1.5.0
   _setup_environment
   cleanup_all
 }

diff --git a/test/system/108-completion.bats b/test/system/108-completion.bats
@@ -20,6 +20,7 @@ load 'libs/bats-assert/load'
 load 'libs/helpers'
 
 setup() {
+  bats_require_minimum_version 1.5.0
   _setup_environment
 }