Merge branch 'main' of https://github.com/containerd/nerdctl into tinamor/fix-build-with-tty

Author: TinaMor

cmd/nerdctl/container/container_diff.go

@@ -197,8 +197,8 @@ func getChanges(ctx context.Context, client *containerd.Client, container contai
 	return changes, err
 }
 
-func appendChanges(changes []fs.Change, new fs.Change) []fs.Change {
-	newDir, _ := filepath.Split(new.Path)
+func appendChanges(changes []fs.Change, fsChange fs.Change) []fs.Change {
+	newDir, _ := filepath.Split(fsChange.Path)
 	newDirPath := filepath.SplitList(newDir)
 
 	if len(changes) == 0 {
@@ -208,7 +208,7 @@ func appendChanges(changes []fs.Change, new fs.Change) []fs.Change {
 				Path: filepath.Join(newDirPath[:i+1]...),
 			})
 		}
-		return append(changes, new)
+		return append(changes, fsChange)
 	}
 	last := changes[len(changes)-1]
 	lastDir, _ := filepath.Split(last.Path)
@@ -222,7 +222,7 @@ func appendChanges(changes []fs.Change, new fs.Change) []fs.Change {
 			Path: filepath.Join(newDirPath[:i+1]...),
 		})
 	}
-	return append(changes, new)
+	return append(changes, fsChange)
 }
 
 func diffShellComplete(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {

go.mod

@@ -17,7 +17,7 @@ require (
 	github.com/containerd/console v1.0.4
 	github.com/containerd/containerd/api v1.8.0
 	github.com/containerd/containerd/v2 v2.0.0
-	github.com/containerd/continuity v0.4.4
+	github.com/containerd/continuity v0.4.5
 	github.com/containerd/errdefs v1.0.0
 	github.com/containerd/fifo v1.1.0
 	github.com/containerd/go-cni v1.1.10

go.sum

@@ -35,8 +35,8 @@ github.com/containerd/containerd/api v1.8.0 h1:hVTNJKR8fMc/2Tiw60ZRijntNMd1U+JVM
 github.com/containerd/containerd/api v1.8.0/go.mod h1:dFv4lt6S20wTu/hMcP4350RL87qPWLVa/OHOwmmdnYc=
 github.com/containerd/containerd/v2 v2.0.0 h1:qLDdFaAykQrIyLiqwQrNLLz95wiC36bAZVwioUwqShM=
 github.com/containerd/containerd/v2 v2.0.0/go.mod h1:j25kDy9P48/ngb1sxWIFfK6GsnqOHoSqo1EpAod20VQ=
-github.com/containerd/continuity v0.4.4 h1:/fNVfTJ7wIl/YPMHjf+5H32uFhl63JucB34PlCpMKII=
-github.com/containerd/continuity v0.4.4/go.mod h1:/lNJvtJKUQStBzpVQ1+rasXO1LAWtUQssk28EZvJ3nE=
+github.com/containerd/continuity v0.4.5 h1:ZRoN1sXq9u7V6QoHMcVWGhOwDFqZ4B9i5H6un1Wh0x4=
+github.com/containerd/continuity v0.4.5/go.mod h1:/lNJvtJKUQStBzpVQ1+rasXO1LAWtUQssk28EZvJ3nE=
 github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=
 github.com/containerd/errdefs v1.0.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M=
 github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151Xdx3ZPPE=

pkg/imgutil/filtering.go

@@ -302,12 +302,12 @@ func filter[T any](items []T, f func(item T) (bool, error)) ([]T, error) {
 	return filteredItems, nil
 }
 
-func imageCreatedBetween(image images.Image, min time.Time, max time.Time) bool {
-	return image.CreatedAt.After(min) && image.CreatedAt.Before(max)
+func imageCreatedBetween(image images.Image, minTime time.Time, maxTime time.Time) bool {
+	return image.CreatedAt.After(minTime) && image.CreatedAt.Before(maxTime)
 }
 
-func imageCreatedBefore(image images.Image, max time.Time) bool {
-	return image.CreatedAt.Before(max)
+func imageCreatedBefore(image images.Image, maxTime time.Time) bool {
+	return image.CreatedAt.Before(maxTime)
 }
 
 func matchesAllLabels(imageCfgLabels map[string]string, filterLabels map[string]string) bool {

pkg/netutil/subnet/subnet.go

@@ -111,12 +111,12 @@ func LastIPInSubnet(addr *net.IPNet) (net.IP, error) {
 	}
 	ones, bits := cidr.Mask.Size()
 	if ones == bits {
-		return cidr.IP, err
+		return cidr.IP, nil
 	}
 	for i := range cidr.IP {
 		cidr.IP[i] = cidr.IP[i] | ^cidr.Mask[i]
 	}
-	return cidr.IP, err
+	return cidr.IP, nil
 }
 
 // firstIPInSubnet gets the first IP in a subnet
@@ -129,8 +129,8 @@ func FirstIPInSubnet(addr *net.IPNet) (net.IP, error) {
 	}
 	ones, bits := cidr.Mask.Size()
 	if ones == bits {
-		return cidr.IP, err
+		return cidr.IP, nil
 	}
 	cidr.IP[len(cidr.IP)-1]++
-	return cidr.IP, err
+	return cidr.IP, nil
 }