Github/comply
1
0
Fork 0
mirror of https://github.com/strongdm/comply synced 2024-11-22 15:44:55 +00:00
Code Issues Projects Releases Wiki Activity

never pull the docker container if pandoc is present and working in the PATH

Browse Source
This commit is contained in:
Justin McCarthy 2018-06-01 17:01:22 -07:00
parent 4969d179ec
commit 4d830789ec
No known key found for this signature in database
GPG Key ID: 900437410E142A48
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
internal/cli/app.go
View File

@ -106,12 +106,18 @@ func pandocMustExist(c *cli.Context) error {
pandocExistErr := pandocBinaryMustExist(c) pandocExistErr := pandocBinaryMustExist(c)
dockerExistErr := dockerMustExist(c) dockerExistErr := dockerMustExist(c)
config.SetPandoc(pandocExistErr == nil, dockerExistErr == nil) config.SetPandoc(pandocExistErr == nil, dockerExistErr == nil)
if pandocExistErr != nil && dockerExistErr != nil { if pandocExistErr != nil && dockerExistErr != nil {
return eitherMustExistErr return eitherMustExistErr
} }
// if we don't have pandoc, but we do have docker, execute a pull
if pandocExistErr != nil && dockerExistErr == nil {
dockerPull(c)
}
return nil return nil
} }
@ -170,6 +176,23 @@ func dockerMustExist(c *cli.Context) error {
return dockerErr return dockerErr
} }
_, err = cli.Ping(ctx)
if err != nil {
return dockerErr
}
return nil
}
func dockerPull(c *cli.Context) error {
dockerErr := fmt.Errorf("Docker must be available in order to run `%s`", c.Command.Name)
ctx := context.Background()
cli, err := client.NewEnvClient()
if err != nil {
return dockerErr
}
done := make(chan struct{}) done := make(chan struct{})
defer close(done) defer close(done)