Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Add version-up confirmation flag and skip the latest version confirmation by default #193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 23, 2022
Merged

Add version-up confirmation flag and skip the latest version confirmation by default #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8ebf49
Add version-up confirmation flag and skip the latest version confirma…
tomoyamachi Jul 23, 2022
815fc3d
fix docker host in azure/container-scan
tomoyamachi Jul 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/build-scan-on-push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ jobs:
image-name: ${{ github.sha }}
severity-threshold: CRITICAL
env:
TRIVY_IGNORE_UNFIXED: true
TRIVY_IGNORE_UNFIXED: true
DOCKLE_HOST: "unix:///var/run/docker.sock"
5 changes: 5 additions & 0 deletions pkg/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,11 @@ OPTIONS:
EnvVar: "NO_COLOR",
Usage: "suppress log output",
},
cli.BoolFlag{
Name: "version-check",
EnvVar: "DOCKLE_VERSION_CHECK",
Usage: "show an update notification",
},

// Registry flag
cli.DurationFlag{
Expand Down
17 changes: 10 additions & 7 deletions pkg/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,16 @@ func Run(c *cli.Context) (err error) {
config.CreateFromCli(c)

cliVersion := "v" + c.App.Version
latestVersion, err := utils.FetchLatestVersion(ctx)

// check latest version
if err != nil {
log.Logger.Infof("Failed to check latest version. %s", err)
} else if cliVersion != latestVersion && c.App.Version != "dev" {
log.Logger.Warnf("A new version %s is now available! You have %s.", latestVersion, cliVersion)
if c.Bool("version-check") {
latestVersion, err := utils.FetchLatestVersion(ctx)
// check latest version
if err != nil {
log.Logger.Infof("Failed to check latest version. %s", err)
} else if cliVersion != latestVersion && c.App.Version != "dev" {
log.Logger.Warnf("A new version %s is now available! You have %s.", latestVersion, cliVersion)
}
} else {
log.Logger.Debug("Skipped update confirmation")
}

args := c.Args()
Expand Down