tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don’t use context for scan suggest message, use cliconfig.Dir() as in scan plugin 

Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
This commit is contained in:
Guillaume Tardif 2021-03-05 09:41:04 +01:00
parent b3025ca4fe
commit 5d2e8754df
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
local/compose/build.go
View File

@ -50,7 +50,7 @@ func (s *composeService) Build(ctx context.Context, project *types.Project, opti
err := s.build(ctx, project, opts, options.Progress)
if err == nil {
displayScanSuggestMsg(ctx, imagesToBuild)
displayScanSuggestMsg(imagesToBuild)
}
return err
@ -100,7 +100,7 @@ func (s *composeService) ensureImagesExists(ctx context.Context, project *types.
err := s.build(ctx, project, opts, "auto")
if err == nil {
displayScanSuggestMsg(ctx, imagesToBuild)
displayScanSuggestMsg(imagesToBuild)
}
return err
}

12
local/compose/scan_suggest.go
View File

@ -17,7 +17,6 @@
package compose
import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
@ -26,25 +25,24 @@ import (
pluginmanager "github.com/docker/cli/cli-plugins/manager"
"github.com/docker/cli/cli/command"
"github.com/docker/compose-cli/api/config"
cliConfig "github.com/docker/cli/cli/config"
)
func displayScanSuggestMsg(ctx context.Context, builtImages []string) {
func displayScanSuggestMsg(builtImages []string) {
if len(builtImages) <= 0 {
return
}
if os.Getenv("DOCKER_SCAN_SUGGEST") == "false" {
return
}
if !scanAvailable() || scanAlreadyInvoked(ctx) {
if !scanAvailable() || scanAlreadyInvoked() {
return
}
fmt.Println("Use 'docker scan' to run Snyk tests against images to find vulnerabilities and learn how to fix them")
}
func scanAlreadyInvoked(ctx context.Context) bool {
configDir := config.Dir(ctx)
filename := filepath.Join(configDir, "scan", "config.json")
func scanAlreadyInvoked() bool {
filename := filepath.Join(cliConfig.Dir(), "scan", "config.json")
f, err := os.Stat(filename)
if os.IsNotExist(err) {
return false