зеркало из https://github.com/microsoft/docker.git
Make host directory mounts use idtools.MkdirAllNewAs
This makes sure that: 1. Already existing directories are left untouched 2. Newly created directories are chowned to the correct root UID/GID in case of user namespaces 3. All parent directories still get created with host root UID/GID Fix #21738 Signed-off-by: Antonis Kalipetis <akalipetis@gmail.com>
This commit is contained in:
Родитель
01fe5639bc
Коммит
72d8a77d52
|
@ -28,7 +28,8 @@ func (daemon *Daemon) setupMounts(c *container.Container) ([]container.Mount, er
|
|||
if err := daemon.lazyInitializeVolume(c.ID, m); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
path, err := m.Setup(c.MountLabel)
|
||||
rootUID, rootGID := daemon.GetRemappedUIDGID()
|
||||
path, err := m.Setup(c.MountLabel, rootUID, rootGID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
|
|
@ -6,8 +6,8 @@ import (
|
|||
"strings"
|
||||
"syscall"
|
||||
|
||||
"github.com/docker/docker/pkg/idtools"
|
||||
"github.com/docker/docker/pkg/stringid"
|
||||
"github.com/docker/docker/pkg/system"
|
||||
mounttypes "github.com/docker/engine-api/types/mount"
|
||||
"github.com/opencontainers/runc/libcontainer/label"
|
||||
)
|
||||
|
@ -107,7 +107,7 @@ type MountPoint struct {
|
|||
|
||||
// Setup sets up a mount point by either mounting the volume if it is
|
||||
// configured, or creating the source directory if supplied.
|
||||
func (m *MountPoint) Setup(mountLabel string) (string, error) {
|
||||
func (m *MountPoint) Setup(mountLabel string, rootUID, rootGID int) (string, error) {
|
||||
if m.Volume != nil {
|
||||
if m.ID == "" {
|
||||
m.ID = stringid.GenerateNonCryptoID()
|
||||
|
@ -117,8 +117,9 @@ func (m *MountPoint) Setup(mountLabel string) (string, error) {
|
|||
if len(m.Source) == 0 {
|
||||
return "", fmt.Errorf("Unable to setup mount point, neither source nor volume defined")
|
||||
}
|
||||
// system.MkdirAll() produces an error if m.Source exists and is a file (not a directory),
|
||||
if err := system.MkdirAll(m.Source, 0755); err != nil {
|
||||
// idtools.MkdirAllNewAs() produces an error if m.Source exists and is a file (not a directory)
|
||||
// also, makes sure that if the directory is created, the correct remapped rootUID/rootGID will own it
|
||||
if err := idtools.MkdirAllNewAs(m.Source, 0755, rootUID, rootGID); err != nil {
|
||||
if perr, ok := err.(*os.PathError); ok {
|
||||
if perr.Err != syscall.ENOTDIR {
|
||||
return "", err
|
||||
|
|
Загрузка…
Ссылка в новой задаче