Merge pull request #50550 from thaJeztah/rootless_internal

pkg/rootless: move to daemon/internal

daemon/command/daemon.go

@@ -29,6 +29,7 @@ import (
 	"github.com/docker/docker/daemon/internal/builder-next/exporter"
 	"github.com/docker/docker/daemon/internal/libcontainerd/supervisor"
 	"github.com/docker/docker/daemon/internal/otelutil"
+	"github.com/docker/docker/daemon/internal/rootless"
 	"github.com/docker/docker/daemon/listeners"
 	dopts "github.com/docker/docker/daemon/pkg/opts"
 	"github.com/docker/docker/daemon/pkg/plugin"
@@ -53,7 +54,6 @@ import (
 	"github.com/docker/docker/pkg/homedir"
 	"github.com/docker/docker/pkg/pidfile"
 	"github.com/docker/docker/pkg/plugingetter"
-	"github.com/docker/docker/pkg/rootless"
 	"github.com/docker/go-connections/tlsconfig"
 	"github.com/moby/buildkit/session"
 	"github.com/moby/buildkit/util/tracing/detect"

daemon/command/docker.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/containerd/log"
 	"github.com/docker/docker/daemon/config"
+	"github.com/docker/docker/daemon/internal/rootless"
 	"github.com/docker/docker/dockerversion"
-	"github.com/docker/docker/pkg/rootless"
 	"github.com/moby/buildkit/util/apicaps"
 	"github.com/spf13/cobra"
 )

daemon/config/config_linux.go

@@ -11,10 +11,10 @@ import (
 
 	"github.com/containerd/cgroups/v3"
 	"github.com/containerd/log"
+	"github.com/docker/docker/daemon/internal/rootless"
 	"github.com/docker/docker/daemon/libnetwork/drivers/bridge"
 	"github.com/docker/docker/daemon/pkg/opts"
 	"github.com/docker/docker/pkg/homedir"
-	"github.com/docker/docker/pkg/rootless"
 	"github.com/moby/moby/api/types/container"
 	"github.com/moby/moby/api/types/system"
 	"github.com/pkg/errors"

daemon/info_unix.go

@@ -14,7 +14,7 @@ import (
 	runcoptions "github.com/containerd/containerd/api/types/runc/options"
 	"github.com/containerd/log"
 	"github.com/docker/docker/daemon/config"
-	"github.com/docker/docker/pkg/rootless"
+	"github.com/docker/docker/daemon/internal/rootless"
 	"github.com/docker/docker/pkg/sysinfo"
 	"github.com/moby/moby/api/types"
 	containertypes "github.com/moby/moby/api/types/container"

daemon/libnetwork/iptables/iptables.go

@@ -16,7 +16,7 @@ import (
 	"time"
 
 	"github.com/containerd/log"
-	"github.com/docker/docker/pkg/rootless"
+	"github.com/docker/docker/daemon/internal/rootless"
 )
 
 // Action signifies the iptable action.

pkg/plugins/discovery_unix.go

@@ -3,10 +3,10 @@
 package plugins
 
 import (
+	"os"
 	"path/filepath"
 
 	"github.com/docker/docker/pkg/homedir"
-	"github.com/docker/docker/pkg/rootless"
 )
 
 func rootlessConfigPluginsPath() string {
@@ -25,7 +25,8 @@ func rootlessLibPluginsPath() string {
 
 // specsPaths is the non-Windows implementation of [SpecsPaths].
 func specsPaths() []string {
-	if rootless.RunningWithRootlessKit() {
+	// TODO(thaJeztah): switch back to daemon/internal/rootless.RunningWithRootlessKit if this package moves internal to the daemon.
+	if os.Getenv("ROOTLESSKIT_STATE_DIR") != "" {
 		return []string{rootlessConfigPluginsPath(), rootlessLibPluginsPath()}
 	}
 	return []string{"/etc/docker/plugins", "/usr/lib/docker/plugins"}