Remzona54/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2026-10-20 19:02:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Move formatter => cli/formatter. Needed to move formatter.MemBytes => utils.MemBytes (helper class on memory display)

Browse source 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
This commit is contained in:
Guillaume Tardif 2021-01-15 16:45:27 +01:00
parent 0ea97920c1
commit fe39267e3a
24 changed files with 24 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cli/server/proxy/containers.go
View file

@ -20,6 +20,8 @@ import (
"context"
"errors"
"github.com/docker/compose-cli/utils"
"github.com/compose-spec/compose-go/types"
"github.com/containerd/containerd/platforms"
specs "github.com/opencontainers/image-spec/specs-go/v1"
@ -27,7 +29,6 @@ import (
"github.com/docker/compose-cli/api/containers"
containersv1 "github.com/docker/compose-cli/cli/server/protos/containers/v1"
"github.com/docker/compose-cli/cli/server/proxy/streams"
"github.com/docker/compose-cli/formatter"
)
func portsToGrpc(ports []containers.Port) []*containersv1.Port {
@ -185,7 +186,7 @@ func grpcContainerToContainerConfig(request *containersv1.RunRequest) (container
Ports: ports,
Labels: request.GetLabels(),
Volumes: request.GetVolumes(),
MemLimit: formatter.MemBytes(request.GetMemoryLimit()),
MemLimit: utils.MemBytes(request.GetMemoryLimit()),
CPULimit: float64(request.GetCpuLimit()),
RestartPolicyCondition: request.RestartPolicyCondition,
Environment: request.Environment,

5
cli/server/proxy/containers_test.go
View file

@ -19,11 +19,12 @@ package proxy
import (
"testing"
"github.com/docker/compose-cli/utils"
"gotest.tools/v3/assert"
"github.com/docker/compose-cli/api/containers"
containersv1 "github.com/docker/compose-cli/cli/server/protos/containers/v1"
"github.com/docker/compose-cli/formatter"
)
func TestGrpcContainerToContainerConfig(t *testing.T) {
@ -53,7 +54,7 @@ func TestGrpcContainerToContainerConfig(t *testing.T) {
assert.NilError(t, err)
assert.Equal(t, cc.ID, "myId")
assert.Equal(t, cc.Image, "myImage")
assert.Equal(t, cc.MemLimit, formatter.MemBytes(41))
assert.Equal(t, cc.MemLimit, utils.MemBytes(41))
assert.Equal(t, cc.CPULimit, float64(42))
assert.DeepEqual(t, cc.Volumes, []string{"myvolume"})
assert.DeepEqual(t, cc.Ports, []containers.Port{