kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Make chmod on ADDed files 

Fixes #3979
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
This commit is contained in:
Alexandr Morozov 2014-05-19 23:07:31 +04:00
parent ccf29f0b94
commit 620c8c7253
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
integration-cli/build_tests/TestAdd/SingleFileToRoot/Dockerfile
View File

@ -5,4 +5,5 @@ RUN touch /exists
RUN chown dockerio.dockerio /exists
ADD test_file /
RUN [ $(ls -l /test_file | awk '{print $3":"$4}') = 'root:root' ]
RUN [ $(ls -l /test_file | awk '{print $1}') = '-rwxr-xr-x' ]
RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]

2
integration-cli/build_tests/TestAdd/WholeDirToRoot/Dockerfile
View File

@ -5,5 +5,7 @@ RUN touch /exists
RUN chown dockerio.dockerio exists
ADD test_dir /test_dir
RUN [ $(ls -l / | grep test_dir | awk '{print $3":"$4}') = 'root:root' ]
RUN [ $(ls -l / | grep test_dir | awk '{print $1}') = 'drwxr-xr-x' ]
RUN [ $(ls -l /test_dir/test_file | awk '{print $3":"$4}') = 'root:root' ]
RUN [ $(ls -l /test_dir/test_file | awk '{print $1}') = '-rwxr-xr-x' ]
RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]

13
server/buildfile.go
View File

@ -431,9 +431,12 @@ func (b *buildFile) addContext(container *daemon.Container, orig, dest string, r
return err
}
chownR := func(destPath string, uid, gid int) error {
fixPermsR := func(destPath string, uid, gid int) error {
return filepath.Walk(destPath, func(path string, info os.FileInfo, err error) error {
if err := os.Lchown(path, uid, gid); err != nil {
if err := os.Lchown(path, uid, gid); err != nil && !os.IsNotExist(err) {
return err
}
if err := os.Chmod(path, 0755); err != nil && !os.IsNotExist(err) {
return err
}
return nil
@ -450,12 +453,12 @@ func (b *buildFile) addContext(container *daemon.Container, orig, dest string, r
return err
}
for _, file := range files {
if err := chownR(filepath.Join(destPath, file.Name()), 0, 0); err != nil {
if err := fixPermsR(filepath.Join(destPath, file.Name()), 0, 0); err != nil {
return err
}
}
} else {
if err := chownR(destPath, 0, 0); err != nil {
if err := fixPermsR(destPath, 0, 0); err != nil {
return err
}
}
@ -494,7 +497,7 @@ func (b *buildFile) addContext(container *daemon.Container, orig, dest string, r
resPath = path.Join(destPath, path.Base(origPath))
}
if err := chownR(resPath, 0, 0); err != nil {
if err := fixPermsR(resPath, 0, 0); err != nil {
return err
}
return nil