Add support to push images quietly via compose cli

Signed-off-by: Vedant Koditkar <vedant.koditkar@outlook.com>
This commit is contained in:
Vedant Koditkar 2022-02-13 22:40:54 +05:30 committed by Nick Sieger
parent 19d1ab77eb
commit 1d4cb32001
No known key found for this signature in database
GPG Key ID: 222EA328BD6E402A
3 changed files with 13 additions and 3 deletions

View File

@ -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,
})
}

View File

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

View File

@ -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,8 +124,11 @@ func (s *composeService) pushServiceImage(ctx context.Context, service types.Ser
if jm.Error != nil {
return errors.New(jm.Error.Message)
}
if !quietPush {
toPushProgressEvent(service.Name, jm, w)
}
}
return nil
}