Browse code

Merge pull request #12536 from mountkin/remove-unsupported-instructions-from-doc

Remove some unsupported instructions in the docs.

Fred Lifton authored on 2015/04/22 06:08:31
Showing 3 changed files
... ...
@@ -22,7 +22,7 @@ Using an existing container's name or ID you can create a new image.
22 22
 
23 23
 **-c** , **--change**=[]
24 24
    Apply specified Dockerfile instructions while committing the image
25
-   Supported Dockerfile instructions: `ADD`|`CMD`|`ENTRYPOINT`|`ENV`|`EXPOSE`|`FROM`|`MAINTAINER`|`RUN`|`USER`|`LABEL`|`VOLUME`|`WORKDIR`|`COPY`
25
+   Supported Dockerfile instructions: `CMD`|`ENTRYPOINT`|`ENV`|`EXPOSE`|`ONBUILD`|`USER`|`VOLUME`|`WORKDIR`
26 26
 
27 27
 **--help**
28 28
   Print usage statement
... ...
@@ -13,7 +13,7 @@ URL|- [REPOSITORY[:TAG]]
13 13
 # OPTIONS
14 14
 **-c**, **--change**=[]
15 15
    Apply specified Dockerfile instructions while importing the image
16
-   Supported Dockerfile instructions: `ADD`|`CMD`|`ENTRYPOINT`|`ENV`|`EXPOSE`|`FROM`|`MAINTAINER`|`RUN`|`USER`|`LABEL`|`VOLUME`|`WORKDIR`|`COPY`
16
+   Supported Dockerfile instructions: `CMD`|`ENTRYPOINT`|`ENV`|`EXPOSE`|`ONBUILD`|`USER`|`VOLUME`|`WORKDIR`
17 17
 
18 18
 # DESCRIPTION
19 19
 Create a new filesystem image from the contents of a tarball (`.tar`,
... ...
@@ -870,7 +870,8 @@ If this behavior is undesired, set the 'p' option to false.
870 870
 
871 871
 The `--change` option will apply `Dockerfile` instructions to the image
872 872
 that is created.
873
-Supported `Dockerfile` instructions: `ADD`|`CMD`|`ENTRYPOINT`|`ENV`|`EXPOSE`|`FROM`|`MAINTAINER`|`RUN`|`USER`|`LABEL`|`VOLUME`|`WORKDIR`|`COPY`
873
+Supported `Dockerfile` instructions:
874
+`CMD`|`ENTRYPOINT`|`ENV`|`EXPOSE`|`ONBUILD`|`USER`|`VOLUME`|`WORKDIR`
874 875
 
875 876
 #### Commit a container
876 877
 
... ...
@@ -1380,8 +1381,8 @@ the `-` parameter to take the data from `STDIN`.
1380 1380
 
1381 1381
 The `--change` option will apply `Dockerfile` instructions to the image
1382 1382
 that is created.
1383
-Supported `Dockerfile` instructions: `CMD`, `ENTRYPOINT`, `ENV`, `EXPOSE`,
1384
-`ONBUILD`, `USER`, `VOLUME`, `WORKDIR`
1383
+Supported `Dockerfile` instructions:
1384
+`CMD`|`ENTRYPOINT`|`ENV`|`EXPOSE`|`ONBUILD`|`USER`|`VOLUME`|`WORKDIR`
1385 1385
 
1386 1386
 #### Examples
1387 1387