Browse code

Fix typos in docs/reference/builder.md.

Signed-off-by: Ding Fei <dingfei@stars.org.cn>

Ding Fei authored on 2016/10/15 20:03:47
Showing 1 changed files
... ...
@@ -21,7 +21,7 @@ Practices](../userguide/eng-image/dockerfile_best-practices.md) for a tip-orient
21 21
 The [`docker build`](commandline/build.md) command builds an image from
22 22
 a `Dockerfile` and a *context*. The build's context is the files at a specified
23 23
 location `PATH` or `URL`. The `PATH` is a directory on your local filesystem.
24
-The `URL` is a the location of a Git repository.
24
+The `URL` is a Git repository location.
25 25
 
26 26
 A context is processed recursively. So, a `PATH` includes any subdirectories and
27 27
 the `URL` includes the repository and its submodules. A simple build command
... ...
@@ -504,7 +504,7 @@ default is `/bin/sh -c` on Linux or `cmd /S /C` on Windows)
504 504
 - `RUN ["executable", "param1", "param2"]` (*exec* form)
505 505
 
506 506
 The `RUN` instruction will execute any commands in a new layer on top of the
507
-current image and commit the results. The resulting comitted image will be
507
+current image and commit the results. The resulting committed image will be
508 508
 used for the next step in the `Dockerfile`.
509 509
 
510 510
 Layering `RUN` instructions and generating commits conforms to the core
... ...
@@ -519,13 +519,15 @@ command.
519 519
 
520 520
 In the *shell* form you can use a `\` (backslash) to continue a single
521 521
 RUN instruction onto the next line. For example, consider these two lines:
522
+
522 523
 ```
523
-RUN /bin/bash -c 'source $HOME/.bashrc ;\
524
+RUN /bin/bash -c 'source $HOME/.bashrc; \
524 525
 echo $HOME'
525 526
 ```
526 527
 Together they are equivalent to this single line:
528
+
527 529
 ```
528
-RUN /bin/bash -c 'source $HOME/.bashrc ; echo $HOME'
530
+RUN /bin/bash -c 'source $HOME/.bashrc; echo $HOME'
529 531
 ```
530 532
 
531 533
 > **Note**:
... ...
@@ -641,7 +643,7 @@ If the user specifies arguments to `docker run` then they will override the
641 641
 default specified in `CMD`.
642 642
 
643 643
 > **Note**:
644
-> don't confuse `RUN` with `CMD`. `RUN` actually runs a command and commits
644
+> Don't confuse `RUN` with `CMD`. `RUN` actually runs a command and commits
645 645
 > the result; `CMD` does not execute anything at build time, but specifies
646 646
 > the intended command for the image.
647 647
 
... ...
@@ -751,7 +753,7 @@ and
751 751
     ENV myDog Rex The Dog
752 752
     ENV myCat fluffy
753 753
 
754
-will yield the same net results in the final container, but the first form
754
+will yield the same net results in the final image, but the first form
755 755
 is preferred because it produces a single cache layer.
756 756
 
757 757
 The environment variables set using `ENV` will persist when a container is run
... ...
@@ -773,7 +775,7 @@ ADD has two forms:
773 773
 whitespace)
774 774
 
775 775
 The `ADD` instruction copies new files, directories or remote file URLs from `<src>`
776
-and adds them to the filesystem of the container at the path `<dest>`.
776
+and adds them to the filesystem of the image at the path `<dest>`.
777 777
 
778 778
 Multiple `<src>` resource may be specified but if they are files or
779 779
 directories then they must be relative to the source directory that is
... ...
@@ -806,7 +808,7 @@ of whether or not the file has changed and the cache should be updated.
806 806
 > can only contain a URL based `ADD` instruction. You can also pass a
807 807
 > compressed archive through STDIN: (`docker build - < archive.tar.gz`),
808 808
 > the `Dockerfile` at the root of the archive and the rest of the
809
-> archive will get used at the context of the build.
809
+> archive will be used as the context of the build.
810 810
 
811 811
 > **Note**:
812 812
 > If your URL files are protected using authentication, you
... ...
@@ -848,7 +850,7 @@ guide](../userguide/eng-image/dockerfile_best-practices.md#build-cache) for more
848 848
 - If `<src>` is a *local* tar archive in a recognized compression format
849 849
   (identity, gzip, bzip2 or xz) then it is unpacked as a directory. Resources
850 850
   from *remote* URLs are **not** decompressed. When a directory is copied or
851
-  unpacked, it has the same behavior as `tar -x`: the result is the union of:
851
+  unpacked, it has the same behavior as `tar -x`, the result is the union of:
852 852
 
853 853
     1. Whatever existed at the destination path and
854 854
     2. The contents of the source tree, with conflicts resolved in favor
... ...
@@ -1677,7 +1679,7 @@ a shell operates. For example, using `SHELL cmd /S /C /V:ON|OFF` on Windows, del
1677 1677
 environment variable expansion semantics could be modified.
1678 1678
 
1679 1679
 The `SHELL` instruction can also be used on Linux should an alternate shell be
1680
-required such `zsh`, `csh`, `tcsh` and others.
1680
+required such as `zsh`, `csh`, `tcsh` and others.
1681 1681
 
1682 1682
 The `SHELL` feature was added in Docker 1.12.
1683 1683