acdbc285e2
The test was failing because TarOptions was using a non-pointer for ChownOpts, which meant the check for nil was never true, and createTarFile was never using the hdr.UID/GID Signed-off-by: Daniel Nephin <dnephin@docker.com>
25 lines
647 B
Go
25 lines
647 B
Go
// +build !windows
|
|
|
|
package daemon
|
|
|
|
import (
|
|
"github.com/docker/docker/container"
|
|
"github.com/docker/docker/pkg/archive"
|
|
"github.com/docker/docker/pkg/idtools"
|
|
)
|
|
|
|
func (daemon *Daemon) tarCopyOptions(container *container.Container, noOverwriteDirNonDir bool) (*archive.TarOptions, error) {
|
|
if container.Config.User == "" {
|
|
return daemon.defaultTarCopyOptions(noOverwriteDirNonDir), nil
|
|
}
|
|
|
|
user, err := idtools.LookupUser(container.Config.User)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return &archive.TarOptions{
|
|
NoOverwriteDirNonDir: noOverwriteDirNonDir,
|
|
ChownOpts: &idtools.IDPair{UID: user.Uid, GID: user.Gid},
|
|
}, nil
|
|
}
|