docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-13 18:22:35 +03:00
Code Activity

remove chmod 755: fixes #5941

Browse Source 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: 56a53c72d285b3f9fa6b34dcb81c9720a1974bde
Component: engine
This commit is contained in:
Tibor Vass
2014-05-20 13:39:46 -07:00
parent 292cf3ffa3
commit 1e7aa2e3c4
6 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/docs/sources/reference/builder.md
View File

@@ -235,7 +235,9 @@ being built (also called the *context* of the build) or a remote file URL.
`<dest>` is the absolute path to which the source will be copied inside the
destination container.
All new files and directories are created with mode 0755, uid and gid 0.
All new files and directories are created with a uid and gid of 0.
In the case where `<src>` is a remote file URL, the destination will have permissions 600.
> **Note**:
> If you build using STDIN (`docker build - < somefile`), there is no

2
components/engine/integration-cli/build_tests/TestAdd/EtcToRoot/Dockerfile Normal file
View File

@@ -0,0 +1,2 @@
FROM scratch
ADD . /

2
components/engine/integration-cli/build_tests/TestAdd/SingleFileToRoot/Dockerfile
View File

@@ -5,5 +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 /test_file | awk '{print $1}') = '-rw-r--r--' ]
RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]

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

@@ -7,5 +7,5 @@ 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 /test_dir/test_file | awk '{print $1}') = '-rw-r--r--' ]
RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]

15
components/engine/integration-cli/docker_cli_build_test.go
View File

@@ -152,6 +152,21 @@ func TestAddWholeDirToRoot(t *testing.T) {
logDone("build - add whole directory to root")
}
func TestAddEtcToRoot(t *testing.T) {
buildDirectory := filepath.Join(workingDirectory, "build_tests", "TestAdd")
buildCmd := exec.Command(dockerBinary, "build", "-t", "testaddimg", "EtcToRoot")
buildCmd.Dir = buildDirectory
out, exitCode, err := runCommandWithOutput(buildCmd)
errorOut(err, t, fmt.Sprintf("build failed to complete: %v %v", out, err))
if err != nil || exitCode != 0 {
t.Fatal("failed to build the image")
}
deleteImages("testaddimg")
logDone("build - add etc directory to root")
}
// Issue #5270 - ensure we throw a better error than "unexpected EOF"
// when we can't access files in the context.
func TestBuildWithInaccessibleFilesInContext(t *testing.T) {

3
components/engine/server/buildfile.go
View File

@@ -438,9 +438,6 @@ func (b *buildFile) addContext(container *daemon.Container, orig, dest string, r
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
})
}