docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-05-20 10:27:46 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #2876 from tonistiigi/progress-load-fix

Browse Source 
progress: fix missing last progress from loading layers
This commit is contained in:
Tõnis Tiigi 2025-01-02 10:38:17 -08:00 committed by GitHub
commit 206bd6c3a2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
util/dockerutil/progress.go
View File

@ -55,19 +55,21 @@ func fromReader(l progress.SubLogger, rc io.ReadCloser) error {
Started: &now, Started: &now,
} }
} }
timeDelta := time.Since(st.Timestamp)
if timeDelta < minTimeDelta {
continue
}
st.Timestamp = time.Now()
if jm.Status == "Loading layer" { if jm.Status == "Loading layer" {
st.Current = jm.Progress.Current st.Current = jm.Progress.Current
st.Total = jm.Progress.Total st.Total = jm.Progress.Total
} }
now := time.Now()
if jm.Error != nil { if jm.Error != nil {
now := time.Now()
st.Completed = &now st.Completed = &now
} else {
timeDelta := time.Since(st.Timestamp)
if timeDelta < minTimeDelta {
started[id] = st
continue
}
} }
st.Timestamp = now
started[id] = st started[id] = st
l.SetStatus(&st) l.SetStatus(&st)
} }