Skip to content

Commit

Permalink
uncomment docker scan command (#1379)
Browse files Browse the repository at this point in the history
  • Loading branch information
sverdlov93 committed Jan 13, 2022
1 parent 3e3de5a commit 0ea7fad
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 13 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require (
github.com/gookit/color v1.4.2
github.com/jfrog/build-info-go v0.1.6
github.com/jfrog/gofrog v1.1.1
github.com/jfrog/jfrog-cli-core/v2 v2.8.1
github.com/jfrog/jfrog-cli-core/v2 v2.8.2
github.com/jfrog/jfrog-client-go v1.7.0
github.com/jszwec/csvutil v1.4.0
github.com/mholt/archiver v2.1.0+incompatible
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,8 @@ github.com/jfrog/build-info-go v0.1.6 h1:W6S2Nq65PVTpan3le66eOBvuMim2CbUTtRdnVPT
github.com/jfrog/build-info-go v0.1.6/go.mod h1:MBrjdmZ6c7Q/otzFwx6dFrbNIjd/mcYDiEwn6nOUhcs=
github.com/jfrog/gofrog v1.1.1 h1:uRjeZWidQl4FmKP4Zpj5hSKJp3gSIWW9VUwbQdVEVRU=
github.com/jfrog/gofrog v1.1.1/go.mod h1:9YN5v4LlsCfLIXpwQnzSf1wVtgjdHM20FzuIu58RMI4=
github.com/jfrog/jfrog-cli-core/v2 v2.8.1 h1:3fJGkHfvilrIJ/KB6yo0Z0c/0C/qXNRipuQPtVHRfow=
github.com/jfrog/jfrog-cli-core/v2 v2.8.1/go.mod h1:cpLIhK232NYNJWg+zZHAmdL2QaLmTaND2soomBaq7Cc=
github.com/jfrog/jfrog-cli-core/v2 v2.8.2 h1:znImJ8xIkEiW+n3lnFrdZ4DkcZ5TtRx3d3Qbi1Fekjo=
github.com/jfrog/jfrog-cli-core/v2 v2.8.2/go.mod h1:cpLIhK232NYNJWg+zZHAmdL2QaLmTaND2soomBaq7Cc=
github.com/jfrog/jfrog-client-go v1.7.0 h1:dbqhrsQWiX0QjP9R8BQMsaX0W/iC1Ym5GVfXR5TpRXo=
github.com/jfrog/jfrog-client-go v1.7.0/go.mod h1:W/wOYe0TauAvL8xEtiLA8O6b1muLDuYcbw9Vogz6X6c=
github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
Expand Down
21 changes: 11 additions & 10 deletions scan/cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
auditpipdocs "github.com/jfrog/jfrog-cli/docs/scan/auditpip"
auditpipenvdocs "github.com/jfrog/jfrog-cli/docs/scan/auditpipenv"
buildscandocs "github.com/jfrog/jfrog-cli/docs/scan/buildscan"
dockerscandocs "github.com/jfrog/jfrog-cli/docs/scan/dockerscan"
scandocs "github.com/jfrog/jfrog-cli/docs/scan/scan"
"github.com/jfrog/jfrog-cli/utils/cliutils"
"github.com/urfave/cli"
Expand Down Expand Up @@ -139,16 +140,16 @@ func GetCommands() []cli.Command {
BashComplete: corecommondocs.CreateBashCompletionFunc(),
Action: BuildScan,
},
//{
// Name: "docker",
// Category: auditScanCategory,
// Flags: cliutils.GetCommandFlags(cliutils.DockerScan),
// Description: dockerscandocs.GetDescription(),
// HelpName: corecommondocs.CreateUsage("docker scan", dockerscandocs.GetDescription(), dockerscandocs.Usage),
// ArgsUsage: common.CreateEnvVars(),
// BashComplete: corecommondocs.CreateBashCompletionFunc(),
// Action: DockerCommand,
//},
{
Name: "docker",
Category: auditScanCategory,
Flags: cliutils.GetCommandFlags(cliutils.DockerScan),
Description: dockerscandocs.GetDescription(),
HelpName: corecommondocs.CreateUsage("docker scan", dockerscandocs.GetDescription(), dockerscandocs.Usage),
ArgsUsage: common.CreateEnvVars(),
BashComplete: corecommondocs.CreateBashCompletionFunc(),
Action: DockerCommand,
},
})
}

Expand Down

0 comments on commit 0ea7fad

Please sign in to comment.