Просмотр исходного кода

Add support to push images quietly via compose cli

Signed-off-by: Vedant Koditkar <[email protected]>
Vedant Koditkar 3 лет назад
Родитель
Сommit
1d4cb32001
3 измененных файлов с 13 добавлено и 3 удалено
  1. 3 0
      cmd/compose/push.go
  2. 1 0
      pkg/api/api.go
  3. 9 3
      pkg/compose/push.go

+ 3 - 0
cmd/compose/push.go

@@ -29,6 +29,7 @@ type pushOptions struct {
 	composeOptions
 
 	Ignorefailures bool
+	Quiet          bool
 }
 
 func pushCommand(p *projectOptions, backend api.Service) *cobra.Command {
@@ -44,6 +45,7 @@ func pushCommand(p *projectOptions, backend api.Service) *cobra.Command {
 		ValidArgsFunction: completeServiceNames(p),
 	}
 	pushCmd.Flags().BoolVar(&opts.Ignorefailures, "ignore-push-failures", false, "Push what it can and ignores images with push failures")
+	pushCmd.Flags().BoolVarP(&opts.Quiet, "quiet", "q", false, "Push without printing progress information")
 
 	return pushCmd
 }
@@ -56,5 +58,6 @@ func runPush(ctx context.Context, backend api.Service, opts pushOptions, service
 
 	return backend.Push(ctx, project, api.PushOptions{
 		IgnoreFailures: opts.Ignorefailures,
+		Quiet:          opts.Quiet,
 	})
 }

+ 1 - 0
pkg/api/api.go

@@ -183,6 +183,7 @@ type ConvertOptions struct {
 
 // PushOptions group options of the Push API
 type PushOptions struct {
+	Quiet          bool
 	IgnoreFailures bool
 }
 

+ 9 - 3
pkg/compose/push.go

@@ -37,6 +37,9 @@ import (
 )
 
 func (s *composeService) Push(ctx context.Context, project *types.Project, options api.PushOptions) error {
+	if options.Quiet {
+		return s.push(ctx, project, options)
+	}
 	return progress.Run(ctx, func(ctx context.Context) error {
 		return s.push(ctx, project, options)
 	})
@@ -65,7 +68,7 @@ func (s *composeService) push(ctx context.Context, project *types.Project, optio
 		}
 		service := service
 		eg.Go(func() error {
-			err := s.pushServiceImage(ctx, service, info, s.configFile(), w)
+			err := s.pushServiceImage(ctx, service, info, s.configFile(), w, options.Quiet)
 			if err != nil {
 				if !options.IgnoreFailures {
 					return err
@@ -78,7 +81,7 @@ func (s *composeService) push(ctx context.Context, project *types.Project, optio
 	return eg.Wait()
 }
 
-func (s *composeService) pushServiceImage(ctx context.Context, service types.ServiceConfig, info moby.Info, configFile driver.Auth, w progress.Writer) error {
+func (s *composeService) pushServiceImage(ctx context.Context, service types.ServiceConfig, info moby.Info, configFile driver.Auth, w progress.Writer, quietPush bool) error {
 	ref, err := reference.ParseNormalizedNamed(service.Image)
 	if err != nil {
 		return err
@@ -121,7 +124,10 @@ func (s *composeService) pushServiceImage(ctx context.Context, service types.Ser
 		if jm.Error != nil {
 			return errors.New(jm.Error.Message)
 		}
-		toPushProgressEvent(service.Name, jm, w)
+
+		if !quietPush {
+			toPushProgressEvent(service.Name, jm, w)
+		}
 	}
 	return nil
 }