69db6279aa
Although having a request ID available throughout the codebase is very valuable, the impact of requiring a Context as an argument to every function in the codepath of an API request, is too significant and was not properly understood at the time of the review. Furthermore, mixing API-layer code with non-API-layer code makes the latter usable only by API-layer code (one that has a notion of Context). This reverts commit de4164043546d2b9ee3bf323dbc41f4979c84480, reversing changes made to 7daeecd42d7bb112bfe01532c8c9a962bb0c7967. Signed-off-by: Tibor Vass <tibor@docker.com> Conflicts: api/server/container.go builder/internals.go daemon/container_unix.go daemon/create.go Upstream-commit: b08f071e18043abe8ce15f56826d38dd26bedb78 Component: engine
52 lines
1.3 KiB
Go
52 lines
1.3 KiB
Go
package daemon
|
|
|
|
import (
|
|
"github.com/docker/docker/image"
|
|
"github.com/docker/docker/runconfig"
|
|
)
|
|
|
|
// ContainerCommitConfig contains build configs for commit operation,
|
|
// and is used when making a commit with the current state of the container.
|
|
type ContainerCommitConfig struct {
|
|
Pause bool
|
|
Repo string
|
|
Tag string
|
|
Author string
|
|
Comment string
|
|
Config *runconfig.Config
|
|
}
|
|
|
|
// Commit creates a new filesystem image from the current state of a container.
|
|
// The image can optionally be tagged into a repository.
|
|
func (daemon *Daemon) Commit(container *Container, c *ContainerCommitConfig) (*image.Image, error) {
|
|
if c.Pause && !container.isPaused() {
|
|
container.pause()
|
|
defer container.unpause()
|
|
}
|
|
|
|
rwTar, err := container.exportContainerRw()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer func() {
|
|
if rwTar != nil {
|
|
rwTar.Close()
|
|
}
|
|
}()
|
|
|
|
// Create a new image from the container's base layers + a new layer from container changes
|
|
img, err := daemon.graph.Create(rwTar, container.ID, container.ImageID, c.Comment, c.Author, container.Config, c.Config)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// Register the image if needed
|
|
if c.Repo != "" {
|
|
if err := daemon.repositories.Tag(c.Repo, c.Tag, img.ID, true); err != nil {
|
|
return img, err
|
|
}
|
|
}
|
|
container.logEvent("commit")
|
|
return img, nil
|
|
}
|