From 875e717361808764d262496ece932fbd55fe27b0 Mon Sep 17 00:00:00 2001
From: Tonis Tiigi <tonistiigi@gmail.com>
Date: Thu, 19 Dec 2024 21:46:00 -0800
Subject: [PATCH] progress: fix missing last progress from loading layers

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
---
 util/dockerutil/progress.go | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/util/dockerutil/progress.go b/util/dockerutil/progress.go
index 352d1fce..608c9c2a 100644
--- a/util/dockerutil/progress.go
+++ b/util/dockerutil/progress.go
@@ -55,19 +55,21 @@ func fromReader(l progress.SubLogger, rc io.ReadCloser) error {
 				Started: &now,
 			}
 		}
-		timeDelta := time.Since(st.Timestamp)
-		if timeDelta < minTimeDelta {
-			continue
-		}
-		st.Timestamp = time.Now()
 		if jm.Status == "Loading layer" {
 			st.Current = jm.Progress.Current
 			st.Total = jm.Progress.Total
 		}
+		now := time.Now()
 		if jm.Error != nil {
-			now := time.Now()
 			st.Completed = &now
+		} else {
+			timeDelta := time.Since(st.Timestamp)
+			if timeDelta < minTimeDelta {
+				started[id] = st
+				continue
+			}
 		}
+		st.Timestamp = now
 		started[id] = st
 		l.SetStatus(&st)
 	}