kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Fix build with resource limit which system is not support. 

Signed-off-by: Lei Jitang <leijitang@huawei.com>
This commit is contained in:
Lei Jitang 2015-08-18 11:54:00 +08:00
parent f1da5edc8b
commit 770daa15f3
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/server/container.go
View File

@ -399,13 +399,13 @@ func (s *Server) postContainersCreate(version version.Version, w http.ResponseWr
} }
adjustCPUShares := version.LessThan("1.19") adjustCPUShares := version.LessThan("1.19")
containerID, warnings, err := s.daemon.ContainerCreate(name, config, hostConfig, adjustCPUShares) container, warnings, err := s.daemon.ContainerCreate(name, config, hostConfig, adjustCPUShares)
if err != nil { if err != nil {
return err return err
} }
return writeJSON(w, http.StatusCreated, &types.ContainerCreateResponse{ return writeJSON(w, http.StatusCreated, &types.ContainerCreateResponse{
ID: containerID, ID: container.ID,
Warnings: warnings, Warnings: warnings,
}) })
} }

4
builder/internals.go
View File

@ -230,7 +230,7 @@ func (b *builder) runContextCommand(args []string, allowRemote bool, allowDecomp
return nil return nil
} }
container, _, err := b.Daemon.Create(b.Config, nil, "") container, _, err := b.Daemon.ContainerCreate("", b.Config, nil, true)
if err != nil { if err != nil {
return err return err
} }
@ -613,7 +613,7 @@ func (b *builder) create() (*daemon.Container, error) {
config := *b.Config config := *b.Config
// Create the container // Create the container
c, warnings, err := b.Daemon.Create(b.Config, hostConfig, "") c, warnings, err := b.Daemon.ContainerCreate("", b.Config, hostConfig, true)
if err != nil { if err != nil {
return nil, err return nil, err
} }

12
daemon/create.go
View File

@ -11,15 +11,15 @@ import (
"github.com/opencontainers/runc/libcontainer/label" "github.com/opencontainers/runc/libcontainer/label"
) )
func (daemon *Daemon) ContainerCreate(name string, config *runconfig.Config, hostConfig *runconfig.HostConfig, adjustCPUShares bool) (string, []string, error) { func (daemon *Daemon) ContainerCreate(name string, config *runconfig.Config, hostConfig *runconfig.HostConfig, adjustCPUShares bool) (*Container, []string, error) {
if config == nil { if config == nil {
return "", nil, fmt.Errorf("Config cannot be empty in order to create a container") return nil, nil, fmt.Errorf("Config cannot be empty in order to create a container")
} }
warnings, err := daemon.verifyContainerSettings(hostConfig, config) warnings, err := daemon.verifyContainerSettings(hostConfig, config)
daemon.adaptContainerSettings(hostConfig, adjustCPUShares) daemon.adaptContainerSettings(hostConfig, adjustCPUShares)
if err != nil { if err != nil {
return "", warnings, err return nil, warnings, err
} }
container, buildWarnings, err := daemon.Create(config, hostConfig, name) container, buildWarnings, err := daemon.Create(config, hostConfig, name)
@ -29,14 +29,14 @@ func (daemon *Daemon) ContainerCreate(name string, config *runconfig.Config, hos
if tag == "" { if tag == "" {
tag = tags.DefaultTag tag = tags.DefaultTag
} }
return "", warnings, fmt.Errorf("No such image: %s (tag: %s)", config.Image, tag) return nil, warnings, fmt.Errorf("No such image: %s (tag: %s)", config.Image, tag)
} }
return "", warnings, err return nil, warnings, err
} }
warnings = append(warnings, buildWarnings...) warnings = append(warnings, buildWarnings...)
return container.ID, warnings, nil return container, warnings, nil
} }
// Create creates a new container from the given configuration with a given name. // Create creates a new container from the given configuration with a given name.