InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #49814 from thaJeztah/initlayer_rm_idtools

Browse Source 
daemon/initlayer: Setup: remove uses of idtools.Identity
This commit is contained in:
Paweł Gronowski
2025-04-16 09:42:35 +00:00
committed by GitHub
parent 1f43ad3a16 a38ca9a548
commit 2834da861b
5 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
daemon/create.go
View File

@@ -228,7 +228,7 @@ func (daemon *Daemon) create(ctx context.Context, daemonCfg *config.Config, opts
ctr.ImageManifest = imgManifest
// Set RWLayer for container after mount labels have been set
rwLayer, err := daemon.imageService.CreateLayer(ctr, setupInitLayer(daemon.idMapping))
rwLayer, err := daemon.imageService.CreateLayer(ctr, setupInitLayer(daemon.idMapping.RootPair()))
if err != nil {
return nil, errdefs.System(err)
}

6
daemon/daemon_unix.go
View File

@@ -41,7 +41,6 @@ import (
"github.com/docker/docker/libnetwork/options"
lntypes "github.com/docker/docker/libnetwork/types"
"github.com/docker/docker/opts"
"github.com/docker/docker/pkg/idtools"
"github.com/docker/docker/pkg/sysinfo"
"github.com/docker/docker/runconfig"
volumemounts "github.com/docker/docker/volume/mounts"
@@ -1256,10 +1255,9 @@ func removeDefaultBridgeInterface() {
}
}
func setupInitLayer(idMapping user.IdentityMapping) func(string) error {
func setupInitLayer(uid int, gid int) func(string) error {
return func(initPath string) error {
uid, gid := idMapping.RootPair()
return initlayer.Setup(initPath, idtools.Identity{UID: uid, GID: gid})
return initlayer.Setup(initPath, uid, gid)
}
}

2
daemon/daemon_windows.go
View File

@@ -56,7 +56,7 @@ func (daemon *Daemon) parseSecurityOpt(daemonCfg *config.Config, securityOptions
return nil
}
func setupInitLayer(idMapping user.IdentityMapping) func(string) error {
func setupInitLayer(uid int, gid int) func(string) error {
return nil
}

9
daemon/initlayer/setup_unix.go
View File

@@ -7,7 +7,6 @@ import (
"path/filepath"
"strings"
"github.com/docker/docker/pkg/idtools"
"github.com/moby/sys/user"
"golang.org/x/sys/unix"
)
@@ -17,7 +16,7 @@ import (
//
// This extra layer is used by all containers as the top-most ro layer. It protects
// the container from unwanted side-effects on the rw layer.
func Setup(initLayerFs string, rootIdentity idtools.Identity) error {
func Setup(initLayerFs string, uid int, gid int) error {
// Since all paths are local to the container, we can just extract initLayerFs.Path()
initLayer := initLayerFs
@@ -42,12 +41,12 @@ func Setup(initLayerFs string, rootIdentity idtools.Identity) error {
if _, err := os.Stat(filepath.Join(initLayer, pth)); err != nil {
if os.IsNotExist(err) {
if err := user.MkdirAllAndChown(filepath.Join(initLayer, filepath.Dir(pth)), 0o755, rootIdentity.UID, rootIdentity.GID, user.WithOnlyNew); err != nil {
if err := user.MkdirAllAndChown(filepath.Join(initLayer, filepath.Dir(pth)), 0o755, uid, gid, user.WithOnlyNew); err != nil {
return err
}
switch typ {
case "dir":
if err := user.MkdirAllAndChown(filepath.Join(initLayer, pth), 0o755, rootIdentity.UID, rootIdentity.GID, user.WithOnlyNew); err != nil {
if err := user.MkdirAllAndChown(filepath.Join(initLayer, pth), 0o755, uid, gid, user.WithOnlyNew); err != nil {
return err
}
case "file":
@@ -55,7 +54,7 @@ func Setup(initLayerFs string, rootIdentity idtools.Identity) error {
if err != nil {
return err
}
f.Chown(rootIdentity.UID, rootIdentity.GID)
f.Chown(uid, gid)
f.Close()
default:
if err := os.Symlink(typ, filepath.Join(initLayer, pth)); err != nil {

3
plugin/manager_linux.go
View File

@@ -13,7 +13,6 @@ import (
"github.com/docker/docker/api/types"
"github.com/docker/docker/daemon/initlayer"
"github.com/docker/docker/errdefs"
"github.com/docker/docker/pkg/idtools"
"github.com/docker/docker/pkg/plugins"
"github.com/docker/docker/pkg/stringid"
v2 "github.com/docker/docker/plugin/v2"
@@ -55,7 +54,7 @@ func (pm *Manager) enable(p *v2.Plugin, c *controller, force bool) error {
}
rootFS := filepath.Join(pm.config.Root, p.PluginObj.ID, rootFSFileName)
if err := initlayer.Setup(rootFS, idtools.Identity{UID: 0, GID: 0}); err != nil {
if err := initlayer.Setup(rootFS, 0, 0); err != nil {
return errors.WithStack(err)
}