1berry/docker-cli
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2287 from thaJeztah/fix_quiet_push

Browse Source 
Fix: docker push --quiet suppressing errors and exit code
This commit is contained in:
Silvin Lubecki 2020-01-24 16:34:42 +01:00 committed by GitHub
commit e753eec764
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cli/command/image/push.go
View File

@ -3,9 +3,11 @@ package image
import (
"context"
"fmt"
"io/ioutil"
"github.com/docker/cli/cli"
"github.com/docker/cli/cli/command"
"github.com/docker/cli/cli/streams"
"github.com/docker/distribution/reference"
"github.com/docker/docker/pkg/jsonmessage"
"github.com/docker/docker/registry"
@ -68,9 +70,12 @@ func RunPush(dockerCli command.Cli, opts pushOptions) error {
}
defer responseBody.Close()
if !opts.quiet {
return jsonmessage.DisplayJSONMessagesToStream(responseBody, dockerCli.Out(), nil)
if opts.quiet {
err = jsonmessage.DisplayJSONMessagesToStream(responseBody, streams.NewOut(ioutil.Discard), nil)
if err == nil {
fmt.Fprintln(dockerCli.Out(), ref.String())
}
return err
}
fmt.Fprintln(dockerCli.Out(), ref.String())
return nil
return jsonmessage.DisplayJSONMessagesToStream(responseBody, dockerCli.Out(), nil)
}

8
e2e/image/push_test.go
View File

@ -55,6 +55,14 @@ func TestPushWithContentTrust(t *testing.T) {
})
}
func TestPushQuietErrors(t *testing.T) {
result := icmd.RunCmd(icmd.Command("docker", "push", "--quiet", "nosuchimage"))
result.Assert(t, icmd.Expected{
ExitCode: 1,
Err: "An image does not exist locally with the tag: nosuchimage",
})
}
func TestPushWithContentTrustUnreachableServer(t *testing.T) {
skip.If(t, environment.RemoteDaemon())