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

Detect push failure and break

Browse Source 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2020-12-01 16:26:01 +01:00
parent 52574046f0
commit a35147bc63
No known key found for this signature in database
GPG Key ID: 9858809D6F8F6E7E
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
local/compose.go
View File

@ -132,6 +132,9 @@ func (s *composeService) Push(ctx context.Context, project *types.Project) error
} }
return err return err
} }
if jm.Error != nil {
return errors.New(jm.Error.Message)
}
toProgressEvent(service.Name, jm, w) toProgressEvent(service.Name, jm, w)
} }
return nil return nil
@ -142,13 +145,13 @@ func (s *composeService) Push(ctx context.Context, project *types.Project) error
func toProgressEvent(prefix string, jm jsonmessage.JSONMessage, w progress.Writer) { func toProgressEvent(prefix string, jm jsonmessage.JSONMessage, w progress.Writer) {
if jm.ID == "" { if jm.ID == "" {
// skipped
return return
} }
var ( var (
text string text string
status = progress.Working status = progress.Working
) )
if jm.Status == "Pull complete" || jm.Status == "Already exists" { if jm.Status == "Pull complete" || jm.Status == "Already exists" {
status = progress.Done status = progress.Done
} }
@ -160,7 +163,7 @@ func toProgressEvent(prefix string, jm jsonmessage.JSONMessage, w progress.Write
text = jm.Progress.String() text = jm.Progress.String()
} }
w.Event(progress.Event{ w.Event(progress.Event{
ID: fmt.Sprintf("%s: %s", prefix, jm.ID), ID: fmt.Sprintf("Pushing %s: %s", prefix, jm.ID),
Text: jm.Status, Text: jm.Status,
Status: status, Status: status,
StatusText: text, StatusText: text,