From 6eaccd18aa3a7f39a327f37f9ba33e61c687fcfa Mon Sep 17 00:00:00 2001 From: Tau Date: Tue, 12 Dec 2023 21:17:10 +0000 Subject: [PATCH 1/2] fix missing digest on image force upgrade --- core/system.go | 1 + 1 file changed, 1 insertion(+) diff --git a/core/system.go b/core/system.go index 7d8e2787..28187038 100644 --- a/core/system.go +++ b/core/system.go @@ -528,6 +528,7 @@ func (s *ABSystem) RunOperation(operation ABSystemOperation) error { PrintVerbose("ABSystemRunOperation:err(1.1): %s", err) return NoUpdateError } + imageDigest = s.CurImage.Digest PrintVerbose("ABSystemRunOperation: No update available but --force is set. Proceeding...") } } else { From b6750d4bf1a3363bbbb8aa78383ecc7ded7f23e4 Mon Sep 17 00:00:00 2001 From: Tau Date: Tue, 12 Dec 2023 21:21:37 +0000 Subject: [PATCH 2/2] fix writing old image digest to recipe --- core/system.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/system.go b/core/system.go index 28187038..d2c93cf7 100644 --- a/core/system.go +++ b/core/system.go @@ -628,7 +628,7 @@ func (s *ABSystem) RunOperation(operation ABSystemOperation) error { } } else { imageName = settings.Cnf.FullImageName + "@" + imageDigest - labels["ABRoot.BaseImageDigest"] = s.CurImage.Digest + labels["ABRoot.BaseImageDigest"] = imageDigest } // Delete old image