Merge pull request #1952 from AkihiroSuda/containerd-cgroups-v3

go.mod: github.com/containerd/cgroups/v3 v3.0.1, github.com/docker/docker v24.0.0

cmd/nerdctl/container_run_cgroup_linux_test.go

@@ -23,7 +23,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/containerd/cgroups"
+	"github.com/containerd/cgroups/v3"
 	"github.com/containerd/containerd/pkg/userns"
 	"github.com/containerd/continuity/testutil/loopback"
 	"github.com/containerd/nerdctl/pkg/cmd/container"

cmd/nerdctl/container_stats_linux.go

@@ -23,8 +23,8 @@ import (
 	"strings"
 	"time"
 
-	v1 "github.com/containerd/cgroups/stats/v1"
-	v2 "github.com/containerd/cgroups/v2/stats"
+	v1 "github.com/containerd/cgroups/v3/cgroup1/stats"
+	v2 "github.com/containerd/cgroups/v3/cgroup2/stats"
 	"github.com/containerd/nerdctl/pkg/inspecttypes/native"
 	"github.com/containerd/nerdctl/pkg/statsutil"
 	"github.com/vishvananda/netlink"

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/Microsoft/hcsshim v0.10.0-rc.8
 	github.com/compose-spec/compose-go v1.13.4
 	github.com/containerd/accelerated-container-image v0.6.4
-	github.com/containerd/cgroups v1.1.0
+	github.com/containerd/cgroups/v3 v3.0.1
 	github.com/containerd/console v1.0.3
 	github.com/containerd/containerd v1.7.1
 	github.com/containerd/continuity v0.3.0
@@ -24,8 +24,8 @@ require (
 	github.com/coreos/go-iptables v0.6.0
 	github.com/coreos/go-systemd/v22 v22.5.0
 	github.com/cyphar/filepath-securejoin v0.2.3
-	github.com/docker/cli v23.0.6+incompatible
-	github.com/docker/docker v23.0.6+incompatible
+	github.com/docker/cli v24.0.0+incompatible
+	github.com/docker/docker v24.0.0+incompatible
 	github.com/docker/go-connections v0.4.0
 	github.com/docker/go-units v0.5.0
 	github.com/fahedouch/go-logrotate v0.1.3
@@ -64,7 +64,7 @@ require (
 	github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 // indirect
 	github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20221215162035-5330a85ea652 // indirect
 	github.com/cilium/ebpf v0.9.1 // indirect
-	github.com/containerd/cgroups/v3 v3.0.1 // indirect
+	github.com/containerd/cgroups v1.1.0 // indirect
 	github.com/containerd/fifo v1.1.0 // indirect
 	github.com/containerd/ttrpc v1.2.2 // indirect
 	github.com/containerd/typeurl v1.0.3-0.20220422153119-7f6e6d160d67 // indirect

go.sum

@@ -356,14 +356,14 @@ github.com/djherbis/times v1.5.0 h1:79myA211VwPhFTqUk8xehWrsEO+zcIZj0zT8mXPVARU=
 github.com/djherbis/times v1.5.0/go.mod h1:5q7FDLvbNg1L/KaBmPcWlVR9NmoKo3+ucqUA3ijQhA0=
 github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
 github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
-github.com/docker/cli v23.0.6+incompatible h1:CScadyCJ2ZKUDpAMZta6vK8I+6/m60VIjGIV7Wg/Eu4=
-github.com/docker/cli v23.0.6+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
+github.com/docker/cli v24.0.0+incompatible h1:0+1VshNwBQzQAx9lOl+OYCTCEAD8fKs/qeXMx3O0wqM=
+github.com/docker/cli v24.0.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY=
 github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
-github.com/docker/docker v23.0.6+incompatible h1:aBD4np894vatVX99UTx/GyOUOK4uEcROwA3+bQhEcoU=
-github.com/docker/docker v23.0.6+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v24.0.0+incompatible h1:z4bf8HvONXX9Tde5lGBMQ7yCJgNahmJumdrStZAbeY4=
+github.com/docker/docker v24.0.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y=
 github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A=
 github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0=

pkg/cmd/login/login.go

@@ -34,7 +34,7 @@ import (
 	"github.com/containerd/nerdctl/pkg/imgutil/dockerconfigresolver"
 	dockercliconfig "github.com/docker/cli/cli/config"
 	dockercliconfigtypes "github.com/docker/cli/cli/config/types"
-	dockerapitypes "github.com/docker/docker/api/types"
+	"github.com/docker/docker/api/types/registry"
 	"github.com/docker/docker/errdefs"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/net/context/ctxhttp"
@@ -64,7 +64,7 @@ func Login(ctx context.Context, options types.LoginCommandOptions, stdout io.Wri
 
 	authConfig, err := GetDefaultAuthConfig(options.Username == "" && options.Password == "", serverAddress, isDefaultRegistry)
 	if authConfig == nil {
-		authConfig = &dockerapitypes.AuthConfig{ServerAddress: serverAddress}
+		authConfig = &registry.AuthConfig{ServerAddress: serverAddress}
 	}
 	if err == nil && authConfig.Username != "" && authConfig.Password != "" {
 		//login With StoreCreds
@@ -116,7 +116,7 @@ func Login(ctx context.Context, options types.LoginCommandOptions, stdout io.Wri
 // Code from github.com/docker/cli/cli/command (v20.10.3)
 // GetDefaultAuthConfig gets the default auth config given a serverAddress
 // If credentials for given serverAddress exists in the credential store, the configuration will be populated with values in it
-func GetDefaultAuthConfig(checkCredStore bool, serverAddress string, isDefaultRegistry bool) (*dockerapitypes.AuthConfig, error) {
+func GetDefaultAuthConfig(checkCredStore bool, serverAddress string, isDefaultRegistry bool) (*registry.AuthConfig, error) {
 	if !isDefaultRegistry {
 		var err error
 		serverAddress, err = convertToHostname(serverAddress)
@@ -137,11 +137,11 @@ func GetDefaultAuthConfig(checkCredStore bool, serverAddress string, isDefaultRe
 	}
 	authconfig.ServerAddress = serverAddress
 	authconfig.IdentityToken = ""
-	res := dockerapitypes.AuthConfig(authconfig)
+	res := registry.AuthConfig(authconfig)
 	return &res, nil
 }
 
-func loginClientSide(ctx context.Context, globalOptions types.GlobalCommandOptions, auth dockerapitypes.AuthConfig) (string, error) {
+func loginClientSide(ctx context.Context, globalOptions types.GlobalCommandOptions, auth registry.AuthConfig) (string, error) {
 	host, err := convertToHostname(auth.ServerAddress)
 	if err != nil {
 		return "", err
@@ -249,7 +249,7 @@ func tryLoginWithRegHost(ctx context.Context, rh docker.RegistryHost) error {
 	return errors.New("too many 401 (probably)")
 }
 
-func ConfigureAuthentication(authConfig *dockerapitypes.AuthConfig, username, password string) error {
+func ConfigureAuthentication(authConfig *registry.AuthConfig, username, password string) error {
 	authConfig.Username = strings.TrimSpace(authConfig.Username)
 	if username = strings.TrimSpace(username); username == "" {
 		username = authConfig.Username

pkg/defaults/cgroup_linux.go

@@ -19,7 +19,7 @@ package defaults
 import (
 	"os"
 
-	"github.com/containerd/cgroups"
+	"github.com/containerd/cgroups/v3"
 	"github.com/containerd/nerdctl/pkg/rootlessutil"
 )
 

pkg/infoutil/infoutil_linux.go

@@ -20,13 +20,13 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/containerd/cgroups"
+	"github.com/containerd/cgroups/v3"
 	"github.com/containerd/nerdctl/pkg/apparmorutil"
 	"github.com/containerd/nerdctl/pkg/defaults"
 	"github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat"
 	"github.com/containerd/nerdctl/pkg/rootlessutil"
+	"github.com/docker/docker/pkg/meminfo"
 	"github.com/docker/docker/pkg/sysinfo"
-	"github.com/docker/docker/pkg/system"
 )
 
 const UnameO = "GNU/Linux"
@@ -120,7 +120,7 @@ func fulfillPlatformInfo(info *dockercompat.Info) {
 		info.Warnings = append(info.Warnings, "WARNING: bridge-nf-call-ip6tables is disabled")
 	}
 	info.NCPU = sysinfo.NumCPU()
-	memLimit, err := system.ReadMemInfo()
+	memLimit, err := meminfo.Read()
 	if err != nil {
 		info.Warnings = append(info.Warnings, fmt.Sprintf("failed to read mem info: %v", err))
 	} else {

pkg/statsutil/stats_linux.go

@@ -19,8 +19,8 @@ package statsutil
 import (
 	"time"
 
-	v1 "github.com/containerd/cgroups/stats/v1"
-	v2 "github.com/containerd/cgroups/v2/stats"
+	v1 "github.com/containerd/cgroups/v3/cgroup1/stats"
+	v2 "github.com/containerd/cgroups/v3/cgroup2/stats"
 	"github.com/vishvananda/netlink"
 )