浏览代码

Merge pull request #304 from docker/aci_inspect_memory_cpu

In ACI inspect, display memory limit in bytes, like Moby `docker inspect`.
Guillaume Tardif 5 年之前
父节点
当前提交
94877b18ab
共有 2 个文件被更改,包括 3 次插入3 次删除
  1. 1 1
      azure/convert/convert.go
  2. 2 2
      azure/convert/convert_test.go

+ 1 - 1
azure/convert/convert.go

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

+ 2 - 2
azure/convert/convert_test.go

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