зеркало из https://github.com/microsoft/docker.git
updated docs & tests
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
This commit is contained in:
Родитель
17d870bed5
Коммит
957c510d72
|
@ -19,6 +19,9 @@ Using an existing container's name or ID you can create a new image.
|
||||||
**-m, --message**=""
|
**-m, --message**=""
|
||||||
Commit message
|
Commit message
|
||||||
|
|
||||||
|
**-p, --pause**=true
|
||||||
|
Pause container during commit
|
||||||
|
|
||||||
# EXAMPLES
|
# EXAMPLES
|
||||||
|
|
||||||
## Creating a new image from an existing container
|
## Creating a new image from an existing container
|
||||||
|
|
|
@ -49,6 +49,11 @@ daemon is configured to listen on.
|
||||||
**New!**
|
**New!**
|
||||||
`start` and `stop` will now return 304 if the container's status is not modified
|
`start` and `stop` will now return 304 if the container's status is not modified
|
||||||
|
|
||||||
|
`POST /commit`
|
||||||
|
|
||||||
|
**New!**
|
||||||
|
Added a `pause` parameter (default `true`) to pause the container during commit
|
||||||
|
|
||||||
## v1.12
|
## v1.12
|
||||||
|
|
||||||
### Full Documentation
|
### Full Documentation
|
||||||
|
|
|
@ -346,7 +346,7 @@ is better to use Dockerfiles to manage your images in a documented and
|
||||||
maintainable way.
|
maintainable way.
|
||||||
|
|
||||||
By default, the container being committed and its processes will be paused
|
By default, the container being committed and its processes will be paused
|
||||||
during the process of committing the image. This reduces the likelihood of
|
while the image is committed. This reduces the likelihood of
|
||||||
encountering data corruption during the process of creating the commit.
|
encountering data corruption during the process of creating the commit.
|
||||||
If this behavior is undesired, set the 'p' option to false.
|
If this behavior is undesired, set the 'p' option to false.
|
||||||
|
|
||||||
|
|
|
@ -45,7 +45,7 @@ func TestCommitWithoutPause(t *testing.T) {
|
||||||
_, _, err = runCommandWithOutput(waitCmd)
|
_, _, err = runCommandWithOutput(waitCmd)
|
||||||
errorOut(err, t, fmt.Sprintf("error thrown while waiting for container: %s", out))
|
errorOut(err, t, fmt.Sprintf("error thrown while waiting for container: %s", out))
|
||||||
|
|
||||||
commitCmd := exec.Command(dockerBinary, "commit", "-p", "false", cleanedContainerID)
|
commitCmd := exec.Command(dockerBinary, "commit", "-p=false", cleanedContainerID)
|
||||||
out, _, err = runCommandWithOutput(commitCmd)
|
out, _, err = runCommandWithOutput(commitCmd)
|
||||||
errorOut(err, t, fmt.Sprintf("failed to commit container to image: %v %v", out, err))
|
errorOut(err, t, fmt.Sprintf("failed to commit container to image: %v %v", out, err))
|
||||||
|
|
||||||
|
@ -58,7 +58,7 @@ func TestCommitWithoutPause(t *testing.T) {
|
||||||
deleteContainer(cleanedContainerID)
|
deleteContainer(cleanedContainerID)
|
||||||
deleteImages(cleanedImageID)
|
deleteImages(cleanedImageID)
|
||||||
|
|
||||||
logDone("commit - echo foo and commit the image")
|
logDone("commit - echo foo and commit the image with --pause=false")
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestCommitNewFile(t *testing.T) {
|
func TestCommitNewFile(t *testing.T) {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче