Merge pull request #8840 from decadent/fix-da-copy-directive-reference

Nuh uh... quoth the build log: Source can't be a URL for COPY
This commit is contained in:
Fred Lifton 2014-11-11 10:57:00 -08:00
commit d6a4d045f7
1 changed files with 6 additions and 9 deletions

View File

@ -355,9 +355,8 @@ change them using `docker run --env <key>=<value>`.
ADD <src>... <dest> ADD <src>... <dest>
The `ADD` instruction copies new files,directories or remote file URLs to The `ADD` instruction copies new files, directories or remote file URLs from `<src>`
the filesystem of the container from `<src>` and add them to the at and adds them to the filesystem of the container at the path `<dest>`.
path `<dest>`.
Multiple `<src>` resource may be specified but if they are files or Multiple `<src>` resource may be specified but if they are files or
directories then they must be relative to the source directory that is directories then they must be relative to the source directory that is
@ -452,13 +451,11 @@ The copy obeys the following rules:
COPY <src>... <dest> COPY <src>... <dest>
The `COPY` instruction copies new files,directories or remote file URLs to The `COPY` instruction copies new files or directories from `<src>`
the filesystem of the container from `<src>` and add them to the at and adds them to the filesystem of the container at the path `<dest>`.
path `<dest>`.
Multiple `<src>` resource may be specified but if they are files or Multiple `<src>` resource may be specified but they must be relative
directories then they must be relative to the source directory that is being to the source directory that is being built (the context of the build).
built (the context of the build).
Each `<src>` may contain wildcards and matching will be done using Go's Each `<src>` may contain wildcards and matching will be done using Go's
[filepath.Match](http://golang.org/pkg/path/filepath#Match) rules. [filepath.Match](http://golang.org/pkg/path/filepath#Match) rules.