fix: checkUpgradable runs unconditionally in dpkg

pkg/pkgmgr/apk.go

@@ -165,15 +165,15 @@
 
 	apkUpdated := imageStateCurrent.Run(llb.Shlex("apk update"), llb.WithProxy(utils.GetProxy()), llb.IgnoreCache).Root()
 
-	// If updating all packages, check for upgrades before proceeding with patch
-	if updates == nil {
-		checkUpgradable := `sh -c "apk list 2>/dev/null | grep -q "upgradable" || exit 1"`
-		apkUpdated = apkUpdated.Run(llb.Shlex(checkUpgradable)).Root()
+	checkUpgradable := `sh -c "apk list 2>/dev/null | grep -q "upgradable" > /upgradable.txt || exit 1"`
+	apkUpdated = apkUpdated.Run(llb.Shlex(checkUpgradable)).Root()
+	_, err := buildkit.ExtractFileFromState(ctx, am.config.Client, &apkUpdated, "/upgradable.txt")
+	if err != nil {
+		return nil, nil, fmt.Errorf("no patchable packages found")
 	}
 
 	var apkInstalled llb.State
 	var resultManifestBytes []byte
-	var err error
 	if updates != nil {
 		// Add all requested update packages
 		// This works around cases where some packages (for example, tiff) require other packages in it's dependency tree to be updated

pkg/pkgmgr/dpkg.go

@@ -344,8 +344,12 @@
 		llb.IgnoreCache,
 	).Root()
 
-	checkUpgradable := `sh -c "apt-get -s upgrade 2>/dev/null | grep -q "^Inst" || exit 1"`
+	checkUpgradable := `sh -c "apt-get -s upgrade 2>/dev/null | grep -q "^Inst" > /upgradable.txt || exit 1"`
 	aptGetUpdated = aptGetUpdated.Run(llb.Shlex(checkUpgradable)).Root()
+	_, err := buildkit.ExtractFileFromState(ctx, dm.config.Client, &aptGetUpdated, "/upgradable.txt")
+	if err != nil {
+		return nil, nil, fmt.Errorf("no patchable packages found")
+	}
 
 	// detect held packages and log them
 	checkHeldCmd := `sh -c "apt-mark showhold | tee /held.txt"`