tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #948 from docker/fix-compose-pull

This commit is contained in:
Nicolas De loof 2020-11-23 10:05:38 +01:00 committed by GitHub
parent 8d7f213ba8 5ffdaa5cca
commit e984f76544
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
local/compose.go
View File

@ -127,8 +127,6 @@ func (s *local) applyPullPolicy(ctx context.Context, service types.ServiceConfig
func toProgressEvent(jm jsonmessage.JSONMessage, w progress.Writer) { func toProgressEvent(jm jsonmessage.JSONMessage, w progress.Writer) {
if jm.Progress != nil { if jm.Progress != nil {
if jm.Progress.Total != 0 { if jm.Progress.Total != 0 {
percentage := int(float64(jm.Progress.Current)/float64(jm.Progress.Total)*100) / 2
numSpaces := 50 - percentage
status := progress.Working status := progress.Working
if jm.Status == "Pull complete" { if jm.Status == "Pull complete" {
status = progress.Done status = progress.Done
@ -137,7 +135,7 @@ func toProgressEvent(jm jsonmessage.JSONMessage, w progress.Writer) {
ID: jm.ID, ID: jm.ID,
Text: jm.Status, Text: jm.Status,
Status: status, Status: status,
StatusText: fmt.Sprintf("[%s>%s] ", strings.Repeat("=", percentage), strings.Repeat(" ", numSpaces)), StatusText: jm.Progress.String(),
}) })
} else { } else {
if jm.Error != nil { if jm.Error != nil {