Skip to content

Deps: remove transient sysinfo package now that moby has moved away from containerd v1 #3909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 23, 2025
Merged

Deps: remove transient sysinfo package now that moby has moved away from containerd v1 #3909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
3 changes: 2 additions & 1 deletion pkg/infoutil/infoutil_freebsd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
13 changes: 9 additions & 4 deletions pkg/infoutil/infoutil_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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))
Expand Down
12 changes: 8 additions & 4 deletions pkg/infoutil/infoutil_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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))
Expand Down
169 changes: 0 additions & 169 deletions pkg/sysinfo/cgroup2_linux.go
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions pkg/sysinfo/doc.go
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions pkg/sysinfo/numcpu.go
View file
Open in desktop

This file was deleted.

Loading
Loading