github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 17:26:28 +00:00
Code Issues Projects Releases Wiki Activity

More specific error message when docker not installed

Browse Source 
Signed-off-by: Ian Campbell <ijc@docker.com>
This commit is contained in:
Ian Campbell 2017-10-06 14:14:50 +01:00
parent 3141ca0bef
commit 52d1bc6395
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/cmd/linuxkit/pkglib/docker.go
View File

@ -23,6 +23,14 @@ func newDockerRunner(dct, cache bool) dockerRunner {
return dockerRunner{dct: dct, cache: cache} return dockerRunner{dct: dct, cache: cache}
} }
func isExecErrNotFound(err error) bool {
eerr, ok := err.(*exec.Error)
if !ok {
return false
}
return eerr.Err == exec.ErrNotFound
}
func (dr dockerRunner) command(args ...string) error { func (dr dockerRunner) command(args ...string) error {
cmd := exec.Command("docker", args...) cmd := exec.Command("docker", args...)
cmd.Stdout = os.Stdout cmd.Stdout = os.Stdout
@ -38,7 +46,11 @@ func (dr dockerRunner) command(args ...string) error {
} }
fmt.Fprintf(os.Stderr, "+ %s%v\n", dct, cmd.Args) fmt.Fprintf(os.Stderr, "+ %s%v\n", dct, cmd.Args)
} }
return cmd.Run() err := cmd.Run()
if isExecErrNotFound(err) {
return fmt.Errorf("linuxkit pkg requires docker to be installed")
}
return err
} }
func (dr dockerRunner) pull(img string) (bool, error) { func (dr dockerRunner) pull(img string) (bool, error) {