toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vendor: docker/docker aaf470eca7b588aa19e6681bff8bf08d17be1bf2

Browse Source 
full diff: 41ac6bef8d...aaf470eca7

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2020-06-15 11:26:48 +02:00
parent c5c6fb1cd4
commit 0d57a400b3
12 changed files with 69 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cli/compose/convert/service.go
View File

@ -531,7 +531,7 @@ func convertResources(source composetypes.Resources) (*swarm.ResourceRequirement
return nil, err
}
}
resources.Limits = &swarm.Resources{
resources.Limits = &swarm.Limit{
NanoCPUs: cpus,
MemoryBytes: int64(source.Limits.MemoryBytes),
}

4
cli/compose/convert/service_test.go
View File

@ -87,7 +87,7 @@ func TestConvertResourcesFull(t *testing.T) {
assert.NilError(t, err)
expected := &swarm.ResourceRequirements{
Limits: &swarm.Resources{
Limits: &swarm.Limit{
NanoCPUs: 3000000,
MemoryBytes: 300000000,
},
@ -112,7 +112,7 @@ func TestConvertResourcesOnlyMemory(t *testing.T) {
assert.NilError(t, err)
expected := &swarm.ResourceRequirements{
Limits: &swarm.Resources{
Limits: &swarm.Limit{
MemoryBytes: 300000000,
},
Reservations: &swarm.Resources{