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

push also consider build.tags

Browse Source 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2023-11-17 16:09:12 +01:00 committed by Nicolas De loof
parent efea084df6
commit cb01186c2b
1 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkg/compose/push.go
View File

@ -23,6 +23,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"io" "io"
"strings"
"github.com/compose-spec/compose-go/types" "github.com/compose-spec/compose-go/types"
"github.com/distribution/reference" "github.com/distribution/reference"
@ -68,8 +69,15 @@ func (s *composeService) push(ctx context.Context, project *types.Project, optio
continue continue
} }
service := service service := service
tags := []string{service.Image}
if service.Build != nil {
tags = append(tags, service.Build.Tags...)
}
for _, tag := range tags {
tag := tag
eg.Go(func() error { eg.Go(func() error {
err := s.pushServiceImage(ctx, service, info, s.configFile(), w, options.Quiet) err := s.pushServiceImage(ctx, tag, info, s.configFile(), w, options.Quiet)
if err != nil { if err != nil {
if !options.IgnoreFailures { if !options.IgnoreFailures {
return err return err
@ -79,11 +87,12 @@ func (s *composeService) push(ctx context.Context, project *types.Project, optio
return nil return nil
}) })
} }
}
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, quietPush bool) error { func (s *composeService) pushServiceImage(ctx context.Context, tag string, info moby.Info, configFile driver.Auth, w progress.Writer, quietPush bool) error {
ref, err := reference.ParseNormalizedNamed(service.Image) ref, err := reference.ParseNormalizedNamed(tag)
if err != nil { if err != nil {
return err return err
} }
@ -107,7 +116,7 @@ func (s *composeService) pushServiceImage(ctx context.Context, service types.Ser
return err return err
} }
stream, err := s.apiClient().ImagePush(ctx, service.Image, moby.ImagePushOptions{ stream, err := s.apiClient().ImagePush(ctx, tag, moby.ImagePushOptions{
RegistryAuth: base64.URLEncoding.EncodeToString(buf), RegistryAuth: base64.URLEncoding.EncodeToString(buf),
}) })
if err != nil { if err != nil {
@ -127,9 +136,10 @@ func (s *composeService) pushServiceImage(ctx context.Context, service types.Ser
} }
if !quietPush { if !quietPush {
toPushProgressEvent(service.Name, jm, w) toPushProgressEvent(tag, jm, w)
} }
} }
return nil return nil
} }
@ -145,7 +155,7 @@ func toPushProgressEvent(prefix string, jm jsonmessage.JSONMessage, w progress.W
current int64 current int64
percent int percent int
) )
if jm.Status == "Pushed" || jm.Status == "Already exists" { if isDone(jm) {
status = progress.Done status = progress.Done
percent = 100 percent = 100
} }
@ -174,3 +184,13 @@ func toPushProgressEvent(prefix string, jm jsonmessage.JSONMessage, w progress.W
StatusText: text, StatusText: text,
}) })
} }
func isDone(msg jsonmessage.JSONMessage) bool {
// TODO there should be a better way to detect push is done than such a status message check
switch strings.ToLower(msg.Status) {
case "pushed", "layer already exists":
return true
default:
return false
}
}