containers
/
toolbox
mirror of https://github.com/containers/toolbox.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmd/run: Use home folder when $PWD is not in toolbox 

Since v0.0.91[0] Toolbox throws an error if $PWD is not available in a
toolbox. While this fixes the problem with 'toolbox enter/run' silently
failing to enter/exec in a container, it still requires an action to be
made by the user. I believe it is better to handle such situations more
gracefully by falling back to entering the user's home folder + printing
a warning about doing so.

[0] https://github.com/containers/toolbox/pull/370
This commit is contained in:
Ondřej Míchal 2020-09-23 17:57:10 +02:00
parent 66c49e0926
commit 3db59abf2a
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/cmd/run.go
View File

@ -279,6 +279,15 @@ func runCommand(container string,
} }
} }
if pathPresent, _ := isPathPresent(container, workingDirectory); !pathPresent {
fmt.Fprintf(os.Stderr, "Error: path %s not found in container %s\n",
workingDirectory, container)
fmt.Fprintf(os.Stderr, "Using %s instead.\n",
currentUser.HomeDir)
workingDirectory = currentUser.HomeDir
}
logrus.Debug("Checking if 'podman exec' supports disabling the detach keys") logrus.Debug("Checking if 'podman exec' supports disabling the detach keys")
var detachKeys []string var detachKeys []string