toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support file name with whitespace for ADD and COPY command

Browse Source 
Closes #8318

Signed-off-by: Seongyeol Lim <seongyeol37@gmail.com>
Upstream-commit: abfb7138871993c53050a2d159ca0fae07bf65e8
Component: engine
This commit is contained in:
Seongyeol Lim
2014-10-06 03:15:09 -07:00
committed by Arnaud Porterie
parent 13e3da74e0
commit 7a2e194724
4 changed files with 139 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/builder/parser/parser.go
View File

@ -50,8 +50,8 @@ func init() {
"env": parseEnv,
"maintainer": parseString,
"from": parseString,
"add": parseStringsWhitespaceDelimited,
"copy": parseStringsWhitespaceDelimited,
"add": parseMaybeJSONToList,
"copy": parseMaybeJSONToList,
"run": parseMaybeJSON,
"cmd": parseMaybeJSON,
"entrypoint": parseMaybeJSON,

9
components/engine/builder/parser/testfiles/ADD-COPY-with-JSON/Dockerfile Normal file
View File

@ -0,0 +1,9 @@
FROM ubuntu:14.04
MAINTAINER Seongyeol Lim <seongyeol37@gmail.com>
COPY . /go/src/github.com/docker/docker
ADD . /
ADD [ "vimrc", "/tmp" ]
COPY [ "bashrc", "/tmp" ]
COPY [ "test file", "/tmp" ]
ADD [ "test file", "/tmp/test file" ]

8
components/engine/builder/parser/testfiles/ADD-COPY-with-JSON/result Normal file
View File

@ -0,0 +1,8 @@
(from "ubuntu:14.04")
(maintainer "Seongyeol Lim <seongyeol37@gmail.com>")
(copy "." "/go/src/github.com/docker/docker")
(add "." "/")
(add "vimrc" "/tmp")
(copy "bashrc" "/tmp")
(copy "test file" "/tmp")
(add "test file" "/tmp/test file")