Przeglądaj źródła

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 10 lat temu
rodzic
commit
0bf0e5a6ef

+ 5 - 6
builder/job.go

@@ -32,16 +32,15 @@ const maxPreambleLength = 100
 
 
 // whitelist of commands allowed for a commit/import
 // whitelist of commands allowed for a commit/import
 var validCommitCommands = map[string]bool{
 var validCommitCommands = map[string]bool{
-	"entrypoint": true,
 	"cmd":        true,
 	"cmd":        true,
-	"user":       true,
-	"workdir":    true,
+	"entrypoint": true,
 	"env":        true,
 	"env":        true,
-	"volume":     true,
 	"expose":     true,
 	"expose":     true,
-	"onbuild":    true,
 	"label":      true,
 	"label":      true,
-	"maintainer": true,
+	"onbuild":    true,
+	"user":       true,
+	"volume":     true,
+	"workdir":    true,
 }
 }
 
 
 type Config struct {
 type Config struct {

+ 1 - 1
docs/reference/commandline/commit.md

@@ -35,7 +35,7 @@ undesired, set the 'p' option to false.
 
 
 The `--change` option will apply `Dockerfile` instructions to the image that is
 The `--change` option will apply `Dockerfile` instructions to the image that is
 created.  Supported `Dockerfile` instructions:
 created.  Supported `Dockerfile` instructions:
-`CMD`|`ENTRYPOINT`|`ENV`|`EXPOSE`|`ONBUILD`|`USER`|`VOLUME`|`WORKDIR`
+`CMD`|`ENTRYPOINT`|`ENV`|`EXPOSE`|`LABEL`|`ONBUILD`|`USER`|`VOLUME`|`WORKDIR`
 
 
 ## Commit a container
 ## Commit a container
 
 

+ 1 - 1
man/docker-commit.1.md

@@ -29,7 +29,7 @@ people.
 
 
 **-c** , **--change**=[]
 **-c** , **--change**=[]
    Apply specified Dockerfile instructions while committing the image
    Apply specified Dockerfile instructions while committing the image
-   Supported Dockerfile instructions: `CMD`|`ENTRYPOINT`|`ENV`|`EXPOSE`|`ONBUILD`|`USER`|`VOLUME`|`WORKDIR`
+   Supported Dockerfile instructions: `CMD`|`ENTRYPOINT`|`ENV`|`EXPOSE`|`LABEL`|`ONBUILD`|`USER`|`VOLUME`|`WORKDIR`
 
 
 **--help**
 **--help**
   Print usage statement
   Print usage statement