Merge pull request containerd#3909 from apostasie/docker-deprecation

Remove transient sysinfo package now that moby has moved away from containerd v1

Author: AkihiroSuda

go.mod

@@ -2,11 +2,6 @@ module github.com/containerd/nerdctl/v2
 
 go 1.22.7
 
-// FIXME:
-// github.com/docker/docker/pkg/sysinfo has been replaced by a fork kept under ./pkg2/sysinfo
-// as Moby is not going to move to containerd v2 anytime soon or fix these transient dependencies.
-// We should still move back to upstream in the future, and remove our copy.
-
 require (
 	github.com/Masterminds/semver/v3 v3.3.1
 	github.com/Microsoft/go-winio v0.6.2
@@ -35,8 +30,8 @@ require (
 	github.com/coreos/go-systemd/v22 v22.5.0
 	github.com/cyphar/filepath-securejoin v0.4.1
 	github.com/distribution/reference v0.6.0
-	github.com/docker/cli v27.5.1+incompatible
-	github.com/docker/docker v27.5.1+incompatible
+	github.com/docker/cli v28.0.0+incompatible
+	github.com/docker/docker v28.0.0+incompatible
 	github.com/docker/go-connections v0.5.0
 	github.com/docker/go-units v0.5.0
 	github.com/fahedouch/go-logrotate v0.2.1
@@ -48,7 +43,6 @@ require (
 	github.com/klauspost/compress v1.18.0
 	github.com/mattn/go-isatty v0.0.20
 	github.com/moby/sys/mount v0.3.4
-	github.com/moby/sys/mountinfo v0.7.2
 	github.com/moby/sys/signal v0.7.1
 	github.com/moby/sys/userns v0.1.0
 	github.com/moby/term v0.5.2
@@ -106,6 +100,7 @@ require (
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/moby/docker-image-spec v1.3.1 // indirect
 	github.com/moby/locker v1.0.1 // indirect
+	github.com/moby/sys/mountinfo v0.7.2 // indirect
 	github.com/moby/sys/sequential v0.6.0 // indirect
 	github.com/moby/sys/symlink v0.3.0 // indirect
 	github.com/moby/sys/user v0.3.0 // indirect

go.sum

@@ -90,10 +90,10 @@ github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5Qvfr
 github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
 github.com/djherbis/times v1.6.0 h1:w2ctJ92J8fBvWPxugmXIv7Nz7Q3iDMKNx9v5ocVH20c=
 github.com/djherbis/times v1.6.0/go.mod h1:gOHeRAz2h+VJNZ5Gmc/o7iD9k4wW7NMVqieYCY99oc0=
-github.com/docker/cli v27.5.1+incompatible h1:JB9cieUT9YNiMITtIsguaN55PLOHhBSz3LKVc6cqWaY=
-github.com/docker/cli v27.5.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
-github.com/docker/docker v27.5.1+incompatible h1:4PYU5dnBYqRQi0294d1FBECqT9ECWeQAIfE8q4YnPY8=
-github.com/docker/docker v27.5.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/cli v28.0.0+incompatible h1:ido37VmLUqEp+5NFb9icd6BuBB+SNDgCn+5kPCr2buA=
+github.com/docker/cli v28.0.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
+github.com/docker/docker v28.0.0+incompatible h1:Olh0KS820sJ7nPsBKChVhk5pzqcwDR15fumfAd/p9hM=
+github.com/docker/docker v28.0.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo=
 github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M=
 github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=

pkg/infoutil/infoutil_freebsd.go

@@ -17,8 +17,9 @@
 package infoutil
 
 import (
+	"github.com/docker/docker/pkg/sysinfo"
+
 	"github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat"
-	"github.com/containerd/nerdctl/v2/pkg/sysinfo"
 )
 
 const UnameO = "FreeBSD"

pkg/infoutil/infoutil_linux.go

@@ -18,17 +18,18 @@ package infoutil
 
 import (
 	"fmt"
+	"runtime"
 	"strings"
 
 	"github.com/docker/docker/pkg/meminfo"
+	"github.com/docker/docker/pkg/sysinfo"
 
 	"github.com/containerd/cgroups/v3"
 
 	"github.com/containerd/nerdctl/v2/pkg/apparmorutil"
 	"github.com/containerd/nerdctl/v2/pkg/defaults"
 	"github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat"
 	"github.com/containerd/nerdctl/v2/pkg/rootlessutil"
-	"github.com/containerd/nerdctl/v2/pkg/sysinfo"
 )
 
 const UnameO = "GNU/Linux"
@@ -113,15 +114,19 @@ func fulfillPlatformInfo(info *dockercompat.Info) {
 	if !info.IPv4Forwarding {
 		info.Warnings = append(info.Warnings, "WARNING: IPv4 forwarding is disabled")
 	}
-	info.BridgeNfIptables = !mobySysInfo.BridgeNFCallIPTablesDisabled
+	// FIXME: BridgeNFCallIP6TablesDisabled is deprecated in moby and always false now
+	// Figure out what we want to do with this
+	info.BridgeNfIptables = true // !mobySysInfo.BridgeNFCallIPTablesDisabled
 	if !info.BridgeNfIptables {
 		info.Warnings = append(info.Warnings, "WARNING: bridge-nf-call-iptables is disabled")
 	}
-	info.BridgeNfIP6tables = !mobySysInfo.BridgeNFCallIP6TablesDisabled
+	// FIXME: BridgeNFCallIP6TablesDisabled is deprecated in moby and always false now
+	// Figure out what we want to do with this
+	info.BridgeNfIP6tables = true // !mobySysInfo.BridgeNFCallIP6TablesDisabled
 	if !info.BridgeNfIP6tables {
 		info.Warnings = append(info.Warnings, "WARNING: bridge-nf-call-ip6tables is disabled")
 	}
-	info.NCPU = sysinfo.NumCPU()
+	info.NCPU = runtime.NumCPU()
 	memLimit, err := meminfo.Read()
 	if err != nil {
 		info.Warnings = append(info.Warnings, fmt.Sprintf("failed to read mem info: %v", err))

pkg/infoutil/infoutil_windows.go

@@ -22,13 +22,13 @@ import (
 	"strings"
 
 	"github.com/docker/docker/pkg/meminfo"
+	"github.com/docker/docker/pkg/sysinfo"
 	"golang.org/x/sys/windows"
 	"golang.org/x/sys/windows/registry"
 
 	"github.com/containerd/log"
 
 	"github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat"
-	"github.com/containerd/nerdctl/v2/pkg/sysinfo"
 )
 
 const UnameO = "Microsoft Windows"
@@ -204,15 +204,19 @@ func fulfillPlatformInfo(info *dockercompat.Info) {
 	if !info.IPv4Forwarding {
 		info.Warnings = append(info.Warnings, "WARNING: IPv4 forwarding is disabled")
 	}
-	info.BridgeNfIptables = !mobySysInfo.BridgeNFCallIPTablesDisabled
+	// FIXME: BridgeNFCallIP6TablesDisabled is deprecated in moby and always false now
+	// Figure out what we want to do with this
+	info.BridgeNfIptables = true // !mobySysInfo.BridgeNFCallIPTablesDisabled
 	if !info.BridgeNfIptables {
 		info.Warnings = append(info.Warnings, "WARNING: bridge-nf-call-iptables is disabled")
 	}
-	info.BridgeNfIP6tables = !mobySysInfo.BridgeNFCallIP6TablesDisabled
+	// FIXME: BridgeNFCallIP6TablesDisabled is deprecated in moby and always false now
+	// Figure out what we want to do with this
+	info.BridgeNfIP6tables = true // !mobySysInfo.BridgeNFCallIP6TablesDisabled
 	if !info.BridgeNfIP6tables {
 		info.Warnings = append(info.Warnings, "WARNING: bridge-nf-call-ip6tables is disabled")
 	}
-	info.NCPU = sysinfo.NumCPU()
+	info.NCPU = runtime.NumCPU()
 	memLimit, err := meminfo.Read()
 	if err != nil {
 		info.Warnings = append(info.Warnings, fmt.Sprintf("failed to read mem info: %v", err))