Browse code
Align 'docker commit' docs with the code It was missing some variants and 'maintainer' isn't actually supported. Also sorted the list of allowed cmds in the code just to make it easier to diff with the docs.
Signed-off-by: Doug Davis <dug@us.ibm.com>
Doug Davis authored on 2015/07/10 01:57:42Showing 3 changed files
| ... | ... |
@@ -32,16 +32,15 @@ const maxPreambleLength = 100 |
| 32 | 32 |
|
| 33 | 33 |
// whitelist of commands allowed for a commit/import |
| 34 | 34 |
var validCommitCommands = map[string]bool{
|
| 35 |
- "entrypoint": true, |
|
| 36 | 35 |
"cmd": true, |
| 37 |
- "user": true, |
|
| 38 |
- "workdir": true, |
|
| 36 |
+ "entrypoint": true, |
|
| 39 | 37 |
"env": true, |
| 40 |
- "volume": true, |
|
| 41 | 38 |
"expose": true, |
| 42 |
- "onbuild": true, |
|
| 43 | 39 |
"label": true, |
| 44 |
- "maintainer": true, |
|
| 40 |
+ "onbuild": true, |
|
| 41 |
+ "user": true, |
|
| 42 |
+ "volume": true, |
|
| 43 |
+ "workdir": true, |
|
| 45 | 44 |
} |
| 46 | 45 |
|
| 47 | 46 |
type Config struct {
|
| ... | ... |
@@ -35,7 +35,7 @@ undesired, set the 'p' option to false. |
| 35 | 35 |
|
| 36 | 36 |
The `--change` option will apply `Dockerfile` instructions to the image that is |
| 37 | 37 |
created. Supported `Dockerfile` instructions: |
| 38 |
-`CMD`|`ENTRYPOINT`|`ENV`|`EXPOSE`|`ONBUILD`|`USER`|`VOLUME`|`WORKDIR` |
|
| 38 |
+`CMD`|`ENTRYPOINT`|`ENV`|`EXPOSE`|`LABEL`|`ONBUILD`|`USER`|`VOLUME`|`WORKDIR` |
|
| 39 | 39 |
|
| 40 | 40 |
## Commit a container |
| 41 | 41 |
|
| ... | ... |
@@ -29,7 +29,7 @@ people. |
| 29 | 29 |
|
| 30 | 30 |
**-c** , **--change**=[] |
| 31 | 31 |
Apply specified Dockerfile instructions while committing the image |
| 32 |
- Supported Dockerfile instructions: `CMD`|`ENTRYPOINT`|`ENV`|`EXPOSE`|`ONBUILD`|`USER`|`VOLUME`|`WORKDIR` |
|
| 32 |
+ Supported Dockerfile instructions: `CMD`|`ENTRYPOINT`|`ENV`|`EXPOSE`|`LABEL`|`ONBUILD`|`USER`|`VOLUME`|`WORKDIR` |
|
| 33 | 33 |
|
| 34 | 34 |
**--help** |
| 35 | 35 |
Print usage statement |