tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-24 06:04:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add support to push images quietly via compose cli

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/compose/push.go
View File

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

1
pkg/api/api.go
View File

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

12
pkg/compose/push.go
View File

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