Merge pull request #48 from cyli/root-rotation-cli

Synchronous CLI command for root CA rotation
This commit is contained in:
Aaron Lehmann
2017-05-16 14:58:05 -07:00
committed by GitHub
11 changed files with 332 additions and 17 deletions

View File

@ -2,6 +2,7 @@ package service
import (
"io"
"io/ioutil"
"github.com/docker/cli/cli/command"
"github.com/docker/cli/cli/command/service/progress"
@ -20,14 +21,7 @@ func waitOnService(ctx context.Context, dockerCli *command.DockerCli, serviceID
}()
if opts.quiet {
go func() {
for {
var buf [1024]byte
if _, err := pipeReader.Read(buf[:]); err != nil {
return
}
}
}()
go io.Copy(ioutil.Discard, pipeReader)
return <-errChan
}