Skip to content

Commit c14f9a8

Browse files
jfrog-ecosystemjfrog-ecosystem
committed
Merge remote-tracking branch 'origin/dev' into v2
2 parents 722c945 + 855b344 commit c14f9a8

14 files changed

+78
-54
lines changed

‎build/apple_release/scripts/download-signed-mac-OS-binaries.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ downloadSignedMacOSBinaries() {
7070
apt-get install unzip
7171

7272
# Extract the artifact and clean up
73-
unzip artifact.zip
73+
unzip -o artifact.zip
7474
rm -rf artifact.zip
7575

7676
# Check if the executable exists

‎build/npm/v2-jf/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/npm/v2-jf/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jfrog-cli-v2-jf",
3-
"version": "2.76.1",
3+
"version": "2.77.0",
44
"description": "🐸 Command-line interface for JFrog Artifactory, Xray, Distribution, Pipelines and Mission Control 🐸",
55
"homepage": "https://github.com/jfrog/jfrog-cli",
66
"preferGlobal": true,

‎build/npm/v2/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/npm/v2/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jfrog-cli-v2",
3-
"version": "2.76.1",
3+
"version": "2.77.0",
44
"description": "🐸 Command-line interface for JFrog Artifactory, Xray, Distribution, Pipelines and Mission Control 🐸",
55
"homepage": "https://github.com/jfrog/jfrog-cli",
66
"preferGlobal": true,

‎buildtools/cli.go

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@ package buildtools
33
import (
44
"errors"
55
"fmt"
6+
"os"
7+
"strconv"
8+
"strings"
9+
610
"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/python"
711
"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/setup"
812
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
913
"github.com/jfrog/jfrog-cli-core/v2/utils/ioutils"
1014
"github.com/jfrog/jfrog-cli-security/utils/techutils"
1115
setupdocs "github.com/jfrog/jfrog-cli/docs/buildtools/setup"
12-
"os"
13-
"strconv"
14-
"strings"
1516

1617
"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/container"
1718
"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/dotnet"
@@ -768,7 +769,7 @@ func pullCmd(c *cli.Context, image string) error {
768769
if show, err := cliutils.ShowGenericCmdHelpIfNeeded(c, c.Args(), "dockerpullhelp"); show || err != nil {
769770
return err
770771
}
771-
_, rtDetails, _, skipLogin, filteredDockerArgs, buildConfiguration, err := extractDockerOptionsFromArgs(c.Args())
772+
_, rtDetails, _, skipLogin, _, filteredDockerArgs, buildConfiguration, err := extractDockerOptionsFromArgs(c.Args())
772773
if err != nil {
773774
return err
774775
}
@@ -791,24 +792,24 @@ func pushCmd(c *cli.Context, image string) (err error) {
791792
if show, err := cliutils.ShowCmdHelpIfNeeded(c, c.Args()); show || err != nil {
792793
return err
793794
}
794-
threads, rtDetails, detailedSummary, skipLogin, filteredDockerArgs, buildConfiguration, err := extractDockerOptionsFromArgs(c.Args())
795+
threads, rtDetails, detailedSummary, skipLogin, validateSha, filteredDockerArgs, buildConfiguration, err := extractDockerOptionsFromArgs(c.Args())
795796
if err != nil {
796797
return
797798
}
798799
printDeploymentView := log.IsStdErrTerminal()
799-
PushCommand := container.NewPushCommand(containerutils.DockerClient)
800-
PushCommand.SetThreads(threads).SetDetailedSummary(detailedSummary || printDeploymentView).SetCmdParams(filteredDockerArgs).SetSkipLogin(skipLogin).SetBuildConfiguration(buildConfiguration).SetServerDetails(rtDetails).SetImageTag(image)
801-
supported, err := PushCommand.IsGetRepoSupported()
800+
pushCommand := container.NewPushCommand(containerutils.DockerClient)
801+
pushCommand.SetThreads(threads).SetDetailedSummary(detailedSummary || printDeploymentView).SetCmdParams(filteredDockerArgs).SetSkipLogin(skipLogin).SetBuildConfiguration(buildConfiguration).SetServerDetails(rtDetails).SetValidateSha(validateSha).SetImageTag(image)
802+
supported, err := pushCommand.IsGetRepoSupported()
802803
if err != nil {
803804
return err
804805
}
805806
if !supported {
806807
return cliutils.NotSupportedNativeDockerCommand("docker-push")
807808
}
808-
err = commands.Exec(PushCommand)
809-
result := PushCommand.Result()
809+
err = commands.Exec(pushCommand)
810+
result := pushCommand.Result()
810811
defer cliutils.CleanupResult(result, &err)
811-
err = cliutils.PrintCommandSummary(PushCommand.Result(), detailedSummary, printDeploymentView, false, err)
812+
err = cliutils.PrintCommandSummary(pushCommand.Result(), detailedSummary, printDeploymentView, false, err)
812813
return
813814
}
814815

@@ -824,7 +825,7 @@ func dockerNativeCmd(c *cli.Context) error {
824825
if show, err := cliutils.ShowCmdHelpIfNeeded(c, c.Args()); show || err != nil {
825826
return err
826827
}
827-
_, _, _, _, cleanArgs, _, err := extractDockerOptionsFromArgs(c.Args())
828+
_, _, _, _, _, cleanArgs, _, err := extractDockerOptionsFromArgs(c.Args())
828829
if err != nil {
829830
return err
830831
}
@@ -833,7 +834,7 @@ func dockerNativeCmd(c *cli.Context) error {
833834
}
834835

835836
// Remove all the none docker CLI flags from args.
836-
func extractDockerOptionsFromArgs(args []string) (threads int, serverDetails *coreConfig.ServerDetails, detailedSummary, skipLogin bool, cleanArgs []string, buildConfig *build.BuildConfiguration, err error) {
837+
func extractDockerOptionsFromArgs(args []string) (threads int, serverDetails *coreConfig.ServerDetails, detailedSummary, skipLogin bool, validateSha bool, cleanArgs []string, buildConfig *build.BuildConfiguration, err error) {
837838
cleanArgs = append([]string(nil), args...)
838839
var serverId string
839840
cleanArgs, serverId, err = coreutils.ExtractServerIdFromCommand(cleanArgs)
@@ -856,6 +857,11 @@ func extractDockerOptionsFromArgs(args []string) (threads int, serverDetails *co
856857
if err != nil {
857858
return
858859
}
860+
// Extract validateSha flag
861+
cleanArgs, validateSha, err = coreutils.ExtractBoolFlagFromArgs(cleanArgs, "validate-sha")
862+
if err != nil {
863+
return
864+
}
859865
cleanArgs, buildConfig, err = build.ExtractBuildDetailsFromArgs(cleanArgs)
860866
return
861867
}
@@ -934,17 +940,9 @@ func NpmPublishCmd(c *cli.Context) (err error) {
934940
if npmCmd.GetXrayScan() {
935941
commandsUtils.ConditionalUploadScanFunc = scan.ConditionalUploadDefaultScanFunc
936942
}
937-
938-
var printDeploymentView, detailedSummary bool
939-
940-
// Deployment view and Detailed summary is not supported when using npmrc for publishing since transfer details are not available.
941-
if npmCmd.UseNative() {
942-
printDeploymentView, detailedSummary = false, false
943-
} else {
944-
printDeploymentView, detailedSummary = log.IsStdErrTerminal(), npmCmd.IsDetailedSummary()
945-
if !detailedSummary {
946-
npmCmd.SetDetailedSummary(printDeploymentView)
947-
}
943+
printDeploymentView, detailedSummary := log.IsStdErrTerminal(), npmCmd.IsDetailedSummary()
944+
if !detailedSummary {
945+
npmCmd.SetDetailedSummary(printDeploymentView)
948946
}
949947
err = commands.Exec(npmCmd)
950948
result := npmCmd.Result()

‎go.mod

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ require (
1616
github.com/docker/docker v27.5.1+incompatible
1717
github.com/gocarina/gocsv v0.0.0-20240520201108-78e41c74b4b1
1818
github.com/jfrog/archiver/v3 v3.6.1
19-
github.com/jfrog/build-info-go v1.10.12
19+
github.com/jfrog/build-info-go v1.10.14
2020
github.com/jfrog/gofrog v1.7.6
21-
github.com/jfrog/jfrog-cli-artifactory v0.3.1
22-
github.com/jfrog/jfrog-cli-core/v2 v2.58.7
21+
github.com/jfrog/jfrog-cli-artifactory v0.3.2
22+
github.com/jfrog/jfrog-cli-core/v2 v2.59.0
2323
github.com/jfrog/jfrog-cli-platform-services v1.9.0
24-
github.com/jfrog/jfrog-cli-security v1.18.0
25-
github.com/jfrog/jfrog-client-go v1.53.1
24+
github.com/jfrog/jfrog-cli-security v1.19.0
25+
github.com/jfrog/jfrog-client-go v1.54.1
2626
github.com/jszwec/csvutil v1.10.0
2727
github.com/manifoldco/promptui v0.9.0
2828
github.com/stretchr/testify v1.10.0
@@ -49,7 +49,7 @@ require (
4949
github.com/c-bata/go-prompt v0.2.6 // indirect
5050
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
5151
github.com/chzyer/readline v1.5.1 // indirect
52-
github.com/cloudflare/circl v1.6.0 // indirect
52+
github.com/cloudflare/circl v1.6.1 // indirect
5353
github.com/containerd/log v0.1.0 // indirect
5454
github.com/containerd/platforms v0.2.1 // indirect
5555
github.com/cpuguy83/dockercfg v0.3.2 // indirect
@@ -189,9 +189,11 @@ require (
189189
sigs.k8s.io/yaml v1.4.0 // indirect
190190
)
191191

192-
//replace github.com/jfrog/jfrog-cli-artifactory => github.com/jfrog/jfrog-cli-artifactory v0.2.5-0.20250514065555-2ad0e403ae04
192+
// replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20250529104758-6d769a684388
193193

194-
//replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20250514055103-d3d0d25f7c85
194+
// replace github.com/jfrog/jfrog-cli-artifactory => github.com/jfrog/jfrog-cli-artifactory v0.3.2-0.20250527103322-0361d8f5612d
195+
196+
// replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20250527091824-60a3b4b741aa
195197

196198
//replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20250508130334-f159cff9b11a
197199

‎go.sum

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ github.com/chzyer/readline v1.5.1/go.mod h1:Eh+b79XXUwfKfcPLepksvw2tcLE/Ct21YObk
5151
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
5252
github.com/chzyer/test v1.0.0 h1:p3BQDXSxOhOG0P9z6/hGnII4LGiEPOYBhs8asl/fC04=
5353
github.com/chzyer/test v1.0.0/go.mod h1:2JlltgoNkt4TW/z9V/IzDdFaMTM2JPIi26O1pF38GC8=
54-
github.com/cloudflare/circl v1.6.0 h1:cr5JKic4HI+LkINy2lg3W2jF8sHCVTBncJr5gIIq7qk=
55-
github.com/cloudflare/circl v1.6.0/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
54+
github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0=
55+
github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
5656
github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
5757
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
5858
github.com/containerd/platforms v0.2.1 h1:zvwtM3rz2YHPQsF2CHYM8+KtB5dvhISiXh5ZpSBQv6A=
@@ -176,8 +176,8 @@ github.com/jedib0t/go-pretty/v6 v6.6.5 h1:9PgMJOVBedpgYLI56jQRJYqngxYAAzfEUua+3N
176176
github.com/jedib0t/go-pretty/v6 v6.6.5/go.mod h1:Uq/HrbhuFty5WSVNfjpQQe47x16RwVGXIveNGEyGtHs=
177177
github.com/jfrog/archiver/v3 v3.6.1 h1:LOxnkw9pOn45DzCbZNFV6K0+6dCsQ0L8mR3ZcujO5eI=
178178
github.com/jfrog/archiver/v3 v3.6.1/go.mod h1:VgR+3WZS4N+i9FaDwLZbq+jeU4B4zctXL+gL4EMzfLw=
179-
github.com/jfrog/build-info-go v1.10.12 h1:KO/YUeKYtDrnpcmsXmwqr6akjzrwA0hSTUB+Op/HF88=
180-
github.com/jfrog/build-info-go v1.10.12/go.mod h1:JcISnovFXKx3wWf3p1fcMmlPdt6adxScXvoJN4WXqIE=
179+
github.com/jfrog/build-info-go v1.10.14 h1:PWnw+rBwiQTHZ5q+84+E8MHFjtAQkB3+Oc2sKwBSSGE=
180+
github.com/jfrog/build-info-go v1.10.14/go.mod h1:JcISnovFXKx3wWf3p1fcMmlPdt6adxScXvoJN4WXqIE=
181181
github.com/jfrog/froggit-go v1.17.0 h1:20Ie787WO27SwB2MOHDvsR6yN7fA5WfRnuAbmUqz1Zs=
182182
github.com/jfrog/froggit-go v1.17.0/go.mod h1:HvDkfFfJwIdsXFdqaB+utvD2cLDRmaC3kF8otYb6Chw=
183183
github.com/jfrog/go-mockhttp v0.3.1 h1:/wac8v4GMZx62viZmv4wazB5GNKs+GxawuS1u3maJH8=
@@ -186,16 +186,16 @@ github.com/jfrog/gofrog v1.7.6 h1:QmfAiRzVyaI7JYGsB7cxfAJePAZTzFz0gRWZSE27c6s=
186186
github.com/jfrog/gofrog v1.7.6/go.mod h1:ntr1txqNOZtHplmaNd7rS4f8jpA5Apx8em70oYEe7+4=
187187
github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYLipdsOFMY=
188188
github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w=
189-
github.com/jfrog/jfrog-cli-artifactory v0.3.1 h1:0F5CgS8iR7o0PoQWcjyLWWnZVrfruNstLezzRaAb9EY=
190-
github.com/jfrog/jfrog-cli-artifactory v0.3.1/go.mod h1:6QUvZ7US2VVUWzixh/ofn6LHhBelzLkAK+v5FqBvwZ4=
191-
github.com/jfrog/jfrog-cli-core/v2 v2.58.7 h1:njRlkJjNZ1cvG25S/6T4h+ouI+ZRABN6xZN87UIzB/M=
192-
github.com/jfrog/jfrog-cli-core/v2 v2.58.7/go.mod h1:ZXcipUeTTEQ/phqHdbCh4wJ5Oo4QVDxzQBREQ0J9mDc=
189+
github.com/jfrog/jfrog-cli-artifactory v0.3.2 h1:oBhiHBtWZCe4rG/WSwFWw3gqGnkcj3/TrfyyECh7AvM=
190+
github.com/jfrog/jfrog-cli-artifactory v0.3.2/go.mod h1:nRWIPgWl6IiZ7u5Ss40BL1YcL/naWwRgnrGllFBV0Ao=
191+
github.com/jfrog/jfrog-cli-core/v2 v2.59.0 h1:Oqi2+skTbJIRDVyhN8kJdCP8w3w1mzXS1/Mx5AIuMsU=
192+
github.com/jfrog/jfrog-cli-core/v2 v2.59.0/go.mod h1:1zZB8vn4yIh/hPj3ed82pI5IhKK9/SzeHsofMcknN68=
193193
github.com/jfrog/jfrog-cli-platform-services v1.9.0 h1:r/ETgJuMUOUu12w20ydsF6paqEaj0khH6bxMRsdNz1Y=
194194
github.com/jfrog/jfrog-cli-platform-services v1.9.0/go.mod h1:pMZMSwhj7yA4VKyj0Skr2lObIyGpZUxNJ40DSLKXU38=
195-
github.com/jfrog/jfrog-cli-security v1.18.0 h1:+Lf7lW7C6XfCsCd11swJicgFackEPIKOOpQTbX3cd/M=
196-
github.com/jfrog/jfrog-cli-security v1.18.0/go.mod h1:ePSAzxTnm5dWmxxLhco7eRNgPbT3FGj/hpBEPrxJAfc=
197-
github.com/jfrog/jfrog-client-go v1.53.1 h1:GDRLUDs6hhfGNjqbI+bjc3ApgBHnpVwURM+f26PVfyw=
198-
github.com/jfrog/jfrog-client-go v1.53.1/go.mod h1:XxYs2QtlTm92yqJ5O4j4vzWI8d4sDtKQUT1miNHMgnw=
195+
github.com/jfrog/jfrog-cli-security v1.19.0 h1:4qggon1biuOvjMjHZ5IWDA4Mh+qp2qecWEdeX6s4Xv8=
196+
github.com/jfrog/jfrog-cli-security v1.19.0/go.mod h1:QMoGTGfKMSnXOuWv3/IclZU+M/AshoJMt68Ft6l7EdE=
197+
github.com/jfrog/jfrog-client-go v1.54.1 h1:IvobRCmwFS/HDht6Vv1JtGzPPytmOX3qS57hRC5fU98=
198+
github.com/jfrog/jfrog-client-go v1.54.1/go.mod h1:1v0eih4thdPA4clBo9TuvAMT25sGDr1IQJ81DXQ/lBY=
199199
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
200200
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
201201
github.com/jszwec/csvutil v1.10.0 h1:upMDUxhQKqZ5ZDCs/wy+8Kib8rZR8I8lOR34yJkdqhI=

‎pip_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,8 @@ func TestTwine(t *testing.T) {
223223
}{
224224
{"twine", "pyproject", "twine", "jfrog-python-example:1.0", []string{}, 2},
225225
{"twine-with-module", "pyproject", "twine-with-module", "twine-with-module", []string{"--module=twine-with-module"}, 2},
226+
{"twine-columns-env-long-filename", "pyprojectlongfilename", "twine-with-long-filename",
227+
"twine-with-long-filename", []string{"--module=twine-with-long-filename"}, 2},
226228
}
227229

228230
// Run test cases.

‎testdata/twine/pyprojectlongfilename/dist/jfrog-python-example-long-filename-2.0.0.dev0+pr.17.br.test.in.artifactorydev.rc.6-py3-none-any.whl

1.15 KB
Binary file not shown.

‎testdata/twine/pyprojectlongfilename/dist/jfrog-python-example-long-filename-2.0.0.dev0+pr.17.br.test.in.artifactorydev.rc.6.tar.gz

961 Bytes
Binary file not shown.

‎testdata/twine/pyprojectlongfilename/pyproject.toml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
[build-system]
2+
requires = ["setuptools>=42", "wheel"]
3+
build-backend = "setuptools.build_meta"
4+
5+
[project]
6+
name = "jfrog-python-example-long-filename"
7+
version = "2.0.0.dev0+pr.17.br.test.in.artifactorydev.rc.6"
8+
description = "Project example for building Python project with JFrog products with long filename"
9+
authors = [
10+
{ name="JFrog", email="[email protected]" }
11+
]
12+
dependencies = [
13+
"PyYAML>3.11",
14+
"nltk"
15+
]

‎utils/cliutils/cli_consts.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import "time"
44

55
const (
66
// General CLI constants
7-
CliVersion = "2.76.1"
7+
CliVersion = "2.77.0"
88
ClientAgent = "jfrog-cli-go"
99

1010
// CLI base commands constants:

‎utils/cliutils/commandsflags.go

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ package cliutils
22

33
import (
44
"fmt"
5-
"github.com/jfrog/jfrog-cli-artifactory/cliutils/flagkit"
65
"sort"
76
"strconv"
87

8+
"github.com/jfrog/jfrog-cli-artifactory/cliutils/flagkit"
9+
910
commonCliUtils "github.com/jfrog/jfrog-cli-core/v2/common/cliutils"
1011
"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
1112

@@ -345,6 +346,7 @@ const (
345346
// Build tool flags
346347
deploymentThreads = "deployment-threads"
347348
skipLogin = "skip-login"
349+
validateSha = "validate-sha"
348350

349351
// Unique docker promote flags
350352
dockerPromotePrefix = "docker-promote-"
@@ -1708,6 +1710,11 @@ var flagsMap = map[string]cli.Flag{
17081710
runNative: cli.BoolFlag{
17091711
Name: runNative,
17101712
Usage: "[Default: false] Set to true if you'd like to use the native client configurations. Note: This flag would invoke native client behind the scenes, has performance implications and does not support deployment view and detailed summary` `",
1713+
1714+
},
1715+
validateSha: cli.BoolFlag{
1716+
Name: validateSha,
1717+
Usage: "[Default: false] Set to true to enable SHA validation during Docker push.` `",
17111718
},
17121719
}
17131720

@@ -1829,11 +1836,11 @@ var commandFlags = map[string][]string{
18291836
},
18301837
Docker: {
18311838
BuildName, BuildNumber, module, Project,
1832-
serverId, skipLogin, threads, detailedSummary, watches, repoPath, licenses, xrOutput, fail, ExtendedTable, BypassArchiveLimits, MinSeverity, FixableOnly, vuln,
1839+
serverId, skipLogin, threads, detailedSummary, watches, repoPath, licenses, xrOutput, fail, ExtendedTable, BypassArchiveLimits, MinSeverity, FixableOnly, vuln, validateSha,
18331840
},
18341841
DockerPush: {
18351842
BuildName, BuildNumber, module, Project,
1836-
serverId, skipLogin, threads, detailedSummary,
1843+
serverId, skipLogin, threads, detailedSummary, validateSha,
18371844
},
18381845
DockerPull: {
18391846
BuildName, BuildNumber, module, Project,
@@ -1845,7 +1852,7 @@ var commandFlags = map[string][]string{
18451852
},
18461853
ContainerPush: {
18471854
BuildName, BuildNumber, module, url, user, password, accessToken, sshPassphrase, sshKeyPath,
1848-
serverId, skipLogin, threads, Project, detailedSummary,
1855+
serverId, skipLogin, threads, Project, detailedSummary, validateSha,
18491856
},
18501857
ContainerPull: {
18511858
BuildName, BuildNumber, module, url, user, password, accessToken, sshPassphrase, sshKeyPath,

0 commit comments

Comments
 (0)