remotecache: other fix to record sorting

Signed-off-by: Mark Gordon <[email protected]>
moby · Aug 8, 2019 · 3c3dac0 · 3c3dac0
1 parent f5a55a9
commit 3c3dac0
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/cache/remotecache/v1/utils.go b/cache/remotecache/v1/utils.go
@@ -78,10 +78,14 @@ func sortConfig(cc *CacheConfig) {
 				if ri.Inputs[i][j].Selector != rj.Inputs[i][j].Selector {
 					return ri.Inputs[i][j].Selector < rj.Inputs[i][j].Selector
 				}
-				return cc.Records[ri.Inputs[i][j].LinkIndex].Digest < cc.Records[rj.Inputs[i][j].LinkIndex].Digest
+				inputDigesti := cc.Records[ri.Inputs[i][j].LinkIndex].Digest
+				inputDigestj := cc.Records[rj.Inputs[i][j].LinkIndex].Digest
+				if inputDigesti != inputDigestj {
+					return inputDigesti < inputDigestj
+				}
 			}
 		}
-		return ri.Digest < rj.Digest
+		return false
 	})
 	for i, l := range sortedRecords {
 		l.newIndex = i