Browse code

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

Fred Lifton authored on 2014/11/12 03:57:00
Showing 1 changed files
... ...
@@ -355,9 +355,8 @@ change them using `docker run --env <key>=<value>`.
355 355
 
356 356
     ADD <src>... <dest>
357 357
 
358
-The `ADD` instruction copies new files,directories or remote file URLs to 
359
-the filesystem of the container  from `<src>` and add them to the at 
360
-path `<dest>`.  
358
+The `ADD` instruction copies new files, directories or remote file URLs from `<src>`
359
+and adds them to the filesystem of the container at the path `<dest>`.  
361 360
 
362 361
 Multiple `<src>` resource may be specified but if they are files or 
363 362
 directories then they must be relative to the source directory that is 
... ...
@@ -452,13 +451,11 @@ The copy obeys the following rules:
452 452
 
453 453
     COPY <src>... <dest>
454 454
 
455
-The `COPY` instruction copies new files,directories or remote file URLs to 
456
-the filesystem of the container  from `<src>` and add them to the at 
457
-path `<dest>`. 
455
+The `COPY` instruction copies new files or directories from `<src>`
456
+and adds them to the filesystem of the container at the path `<dest>`.
458 457
 
459
-Multiple `<src>` resource may be specified but if they are files or 
460
-directories then they must be relative to the source directory that is being 
461
-built (the context of the build).
458
+Multiple `<src>` resource may be specified but they must be relative
459
+to the source directory that is being built (the context of the build).
462 460
 
463 461
 Each `<src>` may contain wildcards and matching will be done using Go's
464 462
 [filepath.Match](http://golang.org/pkg/path/filepath#Match) rules.