Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #30005 from dnephin/fix-stack-deploy-resources 

Fix parsing resources from compose file for stack deploy.
This commit is contained in:
Sebastiaan van Stijn 2017-01-09 22:50:01 +01:00 committed by GitHub
parent f28fbb0b69 c2f0402f4d
commit 993bd37b40
2 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
compose/convert/service.go
View File

@ -263,10 +263,14 @@ func convertUpdateConfig(source *composetypes.UpdateConfig) *swarm.UpdateConfig
func convertResources(source composetypes.Resources) (*swarm.ResourceRequirements, error) { func convertResources(source composetypes.Resources) (*swarm.ResourceRequirements, error) {
resources := &swarm.ResourceRequirements{} resources := &swarm.ResourceRequirements{}
var err error
if source.Limits != nil { if source.Limits != nil {
cpus, err := opts.ParseCPUs(source.Limits.NanoCPUs) var cpus int64
if err != nil { if source.Limits.NanoCPUs != "" {
return nil, err cpus, err = opts.ParseCPUs(source.Limits.NanoCPUs)
if err != nil {
return nil, err
}
} }
resources.Limits = &swarm.Resources{ resources.Limits = &swarm.Resources{
NanoCPUs: cpus, NanoCPUs: cpus,
@ -274,9 +278,12 @@ func convertResources(source composetypes.Resources) (*swarm.ResourceRequirement
} }
} }
if source.Reservations != nil { if source.Reservations != nil {
cpus, err := opts.ParseCPUs(source.Reservations.NanoCPUs) var cpus int64
if err != nil { if source.Reservations.NanoCPUs != "" {
return nil, err cpus, err = opts.ParseCPUs(source.Reservations.NanoCPUs)
if err != nil {
return nil, err
}
} }
resources.Reservations = &swarm.Resources{ resources.Reservations = &swarm.Resources{
NanoCPUs: cpus, NanoCPUs: cpus,

23
compose/convert/service_test.go
View File

@ -80,6 +80,29 @@ func TestConvertResourcesFull(t *testing.T) {
assert.DeepEqual(t, resources, expected) assert.DeepEqual(t, resources, expected)
} }
func TestConvertResourcesOnlyMemory(t *testing.T) {
source := composetypes.Resources{
Limits: &composetypes.Resource{
MemoryBytes: composetypes.UnitBytes(300000000),
},
Reservations: &composetypes.Resource{
MemoryBytes: composetypes.UnitBytes(200000000),
},
}
resources, err := convertResources(source)
assert.NilError(t, err)
expected := &swarm.ResourceRequirements{
Limits: &swarm.Resources{
MemoryBytes: 300000000,
},
Reservations: &swarm.Resources{
MemoryBytes: 200000000,
},
}
assert.DeepEqual(t, resources, expected)
}
func TestConvertHealthcheck(t *testing.T) { func TestConvertHealthcheck(t *testing.T) {
retries := uint64(10) retries := uint64(10)
source := &composetypes.HealthCheckConfig{ source := &composetypes.HealthCheckConfig{