tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #304 from docker/aci_inspect_memory_cpu 

In ACI inspect, display memory limit in bytes, like Moby `docker inspect`.
This commit is contained in:
Guillaume Tardif 2020-06-30 22:16:01 +02:00 committed by GitHub
parent fc4e0f6216 96075236ee
commit 94877b18ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
azure/convert/convert.go
View File

@ -309,7 +309,7 @@ func ContainerGroupToContainer(containerID string, cg containerinstance.Containe
if cc.Resources != nil && if cc.Resources != nil &&
cc.Resources.Limits != nil && cc.Resources.Limits != nil &&
cc.Resources.Limits.MemoryInGB != nil { cc.Resources.Limits.MemoryInGB != nil {
memLimits = *cc.Resources.Limits.MemoryInGB memLimits = *cc.Resources.Limits.MemoryInGB * 1024 * 1024 * 1024
} }
cpuLimit := 0. cpuLimit := 0.

4
azure/convert/convert_test.go
View File

@ -83,7 +83,7 @@ func (suite *ConvertTestSuite) TestContainerGroupToContainer() {
Resources: &containerinstance.ResourceRequirements{ Resources: &containerinstance.ResourceRequirements{
Limits: &containerinstance.ResourceLimits{ Limits: &containerinstance.ResourceLimits{
CPU: to.Float64Ptr(3), CPU: to.Float64Ptr(3),
MemoryInGB: to.Float64Ptr(9), MemoryInGB: to.Float64Ptr(0.1),
}, },
}, },
}, },
@ -95,7 +95,7 @@ func (suite *ConvertTestSuite) TestContainerGroupToContainer() {
Image: "sha256:666", Image: "sha256:666",
Command: "mycommand", Command: "mycommand",
CPULimit: 3, CPULimit: 3,
MemoryLimit: 9, MemoryLimit: 107374182,
Ports: []containers.Port{{ Ports: []containers.Port{{
HostPort: uint32(80), HostPort: uint32(80),
ContainerPort: uint32(80), ContainerPort: uint32(80),