11d471d660
Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com> Implement runRollback to not use runUpdate Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com> Add version tag and add flag quiet to suppress progress output Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com> Removed flags from warnDetachDefault Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com> Used command.Cli interface Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com> Add detach flag on rollback command Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com> Create a fakeClient for service commands Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com> Added unit test for rollback command Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com> Used command.Cli interface instead of *command.DockerCli in service commands Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com> Revert "Removed flags from warnDetachDefault" This reverts commit 3e4f601c8a82cc2599a755dc693409bbc47917fc. Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com> Fixed test.NewFakeCli instanciation Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com> Removed unused receiver Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com> Replaced cli by dockerCli Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com> Revert "Removed unused receiver" This reverts commit 604ef7c13df3d019949ca81d992db501114dafce. Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com> Fixed last typo Signed-off-by: Jimmy Leger <jimmy.leger@gmail.com>
45 lines
1.3 KiB
Go
45 lines
1.3 KiB
Go
package service
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
"io/ioutil"
|
|
|
|
"github.com/docker/cli/cli/command"
|
|
"github.com/docker/cli/cli/command/service/progress"
|
|
"github.com/docker/docker/api/types/versions"
|
|
"github.com/docker/docker/pkg/jsonmessage"
|
|
"github.com/spf13/pflag"
|
|
"golang.org/x/net/context"
|
|
)
|
|
|
|
// waitOnService waits for the service to converge. It outputs a progress bar,
|
|
// if appropriate based on the CLI flags.
|
|
func waitOnService(ctx context.Context, dockerCli command.Cli, serviceID string, quiet bool) error {
|
|
errChan := make(chan error, 1)
|
|
pipeReader, pipeWriter := io.Pipe()
|
|
|
|
go func() {
|
|
errChan <- progress.ServiceProgress(ctx, dockerCli.Client(), serviceID, pipeWriter)
|
|
}()
|
|
|
|
if quiet {
|
|
go io.Copy(ioutil.Discard, pipeReader)
|
|
return <-errChan
|
|
}
|
|
|
|
err := jsonmessage.DisplayJSONMessagesToStream(pipeReader, dockerCli.Out(), nil)
|
|
if err == nil {
|
|
err = <-errChan
|
|
}
|
|
return err
|
|
}
|
|
|
|
// warnDetachDefault warns about the --detach flag future change if it's supported.
|
|
func warnDetachDefault(err io.Writer, clientVersion string, flags *pflag.FlagSet, msg string) {
|
|
if !flags.Changed("detach") && versions.GreaterThanOrEqualTo(clientVersion, "1.29") {
|
|
fmt.Fprintf(err, "Since --detach=false was not specified, tasks will be %s in the background.\n"+
|
|
"In a future release, --detach=false will become the default.\n", msg)
|
|
}
|
|
}
|