Remzona54/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2026-08-27 03:45:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

progress writer uses dockercli.Err stream

Browse source 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2023-03-08 15:11:32 +00:00 • committed by Nicolas De loof
parent fc4d2dfdd8
commit bbe1b77a67
21 changed files with 57 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

16
pkg/progress/writer.go
View file

@ -18,7 +18,7 @@ package progress
import (
"context"
"os"
"io"
"sync"
"github.com/docker/compose/v2/pkg/api"
@ -58,17 +58,17 @@ type progressFunc func(context.Context) error
type progressFuncWithStatus func(context.Context) (string, error)
// Run will run a writer and the progress function in parallel
func Run(ctx context.Context, pf progressFunc) error {
func Run(ctx context.Context, pf progressFunc, out io.Writer) error {
_, err := RunWithStatus(ctx, func(ctx context.Context) (string, error) {
return "", pf(ctx)
})
}, out)
return err
}
// RunWithStatus will run a writer and the progress function in parallel and return a status
func RunWithStatus(ctx context.Context, pf progressFuncWithStatus) (string, error) {
func RunWithStatus(ctx context.Context, pf progressFuncWithStatus, out io.Writer) (string, error) {
eg, _ := errgroup.WithContext(ctx)
w, err := NewWriter(ctx, os.Stderr)
w, err := NewWriter(ctx, out)
var result string
if err != nil {
return "", err
@ -105,17 +105,17 @@ const (
var Mode = ModeAuto
// NewWriter returns a new multi-progress writer
func NewWriter(ctx context.Context, out console.File) (Writer, error) {
func NewWriter(ctx context.Context, out io.Writer) (Writer, error) {
_, isTerminal := term.GetFdInfo(out)
dryRun, ok := ctx.Value(api.DryRunKey{}).(bool)
if !ok {
dryRun = false
}
if Mode == ModeAuto && isTerminal {
return newTTYWriter(out, dryRun)
return newTTYWriter(out.(console.File), dryRun)
}
if Mode == ModeTTY {
return newTTYWriter(out, dryRun)
return newTTYWriter(out.(console.File), dryRun)
}
return &plainWriter{
out: out,