kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Remove engine.Job from builder.CmdBuildConfig.

Browse source 
Signed-off-by: David Calavera <david.calavera@gmail.com>
This commit is contained in:
David Calavera 2015-04-16 14:26:33 -07:00
parent 9a2c009751
commit ae4063585e
7 changed files with 196 additions and 202 deletions
Download patch file Download diff file Expand all files Collapse all files

50
daemon/commit.go
View file

@ -1,12 +1,6 @@
package daemon
import (
"bytes"
"encoding/json"
"io"
"github.com/Sirupsen/logrus"
"github.com/docker/docker/engine"
"github.com/docker/docker/image"
"github.com/docker/docker/runconfig"
)
@ -18,49 +12,7 @@ type ContainerCommitConfig struct {
Author string
Comment string
Changes []string
Config io.ReadCloser
}
func (daemon *Daemon) ContainerCommit(name string, c *ContainerCommitConfig) (string, error) {
container, err := daemon.Get(name)
if err != nil {
return "", err
}
var (
subenv engine.Env
config = container.Config
stdoutBuffer = bytes.NewBuffer(nil)
newConfig runconfig.Config
)
if err := subenv.Decode(c.Config); err != nil {
logrus.Errorf("%s", err)
}
buildConfigJob := daemon.eng.Job("build_config")
buildConfigJob.Stdout.Add(stdoutBuffer)
buildConfigJob.SetenvList("changes", c.Changes)
// FIXME this should be remove when we remove deprecated config param
buildConfigJob.SetenvSubEnv("config", &subenv)
if err := buildConfigJob.Run(); err != nil {
return "", err
}
if err := json.NewDecoder(stdoutBuffer).Decode(&newConfig); err != nil {
return "", err
}
if err := runconfig.Merge(&newConfig, config); err != nil {
return "", err
}
img, err := daemon.Commit(container, c.Repo, c.Tag, c.Comment, c.Author, c.Pause, &newConfig)
if err != nil {
return "", err
}
return img.ID, nil
Config *runconfig.Config
}
// Commit creates a new filesystem image from the current state of a container.