Merge pull request #11844 from jbarbier/cgroup-parent-42

Adding cgroup-parent option for docker build
This commit is contained in:
Arnaud Porterie
2015-05-05 14:46:47 -07:00
8 changed files with 60 additions and 13 deletions

View File

@@ -1301,6 +1301,7 @@ func (s *Server) postBuild(version version.Version, w http.ResponseWriter, r *ht
buildConfig.CpuQuota = int64ValueOrZero(r, "cpuquota")
buildConfig.CpuSetCpus = r.FormValue("cpusetcpus")
buildConfig.CpuSetMems = r.FormValue("cpusetmems")
buildConfig.CgroupParent = r.FormValue("cgroupparent")
// Job cancellation. Note: not all job types support this.
if closeNotifier, ok := w.(http.CloseNotifier); ok {