clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-06 21:51:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14061 from runcom/clean-builder-daemon-config

Browse Source 
Add struct to configure Builder commit
This commit is contained in:
David Calavera
2015-06-29 11:04:05 -07:00
parent cb2079e218 7046651b87
commit d543a01e17
4 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/server/server.go
+3 -3
View File
@@ -671,7 +671,7 @@ func (s *Server) postCommit(version version.Version, w http.ResponseWriter, r *h
return err
}
cont := r.Form.Get("container")
cname := r.Form.Get("container")
pause := boolValue(r, "pause")
if r.FormValue("pause") == "" && version.GreaterThanOrEqualTo("1.13") {
@@ -683,7 +683,7 @@ func (s *Server) postCommit(version version.Version, w http.ResponseWriter, r *h
return err
}
containerCommitConfig := &daemon.ContainerCommitConfig{
commitCfg := &builder.BuilderCommitConfig{
Pause: pause,
Repo: r.Form.Get("repo"),
Tag: r.Form.Get("tag"),
@@ -693,7 +693,7 @@ func (s *Server) postCommit(version version.Version, w http.ResponseWriter, r *h
Config: c,
}
imgID, err := builder.Commit(s.daemon, cont, containerCommitConfig)
imgID, err := builder.Commit(cname, s.daemon, commitCfg)
if err != nil {
return err
}