From 65fda188217d15a349b77c5bf1dbeea20d2699c6 Mon Sep 17 00:00:00 2001 From: Nicolas De Loof Date: Mon, 17 Apr 2023 12:09:16 +0200 Subject: [PATCH] bump compose-go Signed-off-by: Nicolas De Loof --- go.mod | 4 ++-- go.sum | 8 ++++---- pkg/compose/build.go | 6 +++--- pkg/compose/create.go | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/go.mod b/go.mod index 71e54de7..f188a4db 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( github.com/AlecAivazis/survey/v2 v2.3.6 github.com/buger/goterm v1.0.4 - github.com/compose-spec/compose-go v1.13.2 + github.com/compose-spec/compose-go v1.13.3 github.com/containerd/console v1.0.3 github.com/containerd/containerd v1.6.19 github.com/cucumber/godog v0.0.0-00010101000000-000000000000 // replaced; see replace for the actual version used @@ -92,7 +92,7 @@ require ( github.com/hashicorp/go-memdb v1.3.2 // indirect github.com/hashicorp/golang-lru v0.5.4 // indirect github.com/hashicorp/hcl v1.0.0 // indirect - github.com/imdario/mergo v0.3.14 // indirect + github.com/imdario/mergo v0.3.15 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jinzhu/gorm v1.9.11 // indirect github.com/jonboulle/clockwork v0.4.0 diff --git a/go.sum b/go.sum index 6f87f5e3..2a0e257e 100644 --- a/go.sum +++ b/go.sum @@ -165,8 +165,8 @@ github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/compose-spec/compose-go v1.13.2 h1:FDfb5ddIpbGbxLRg5qjObOf5CrWbKnuHZ+zvpEdCqKc= -github.com/compose-spec/compose-go v1.13.2/go.mod h1:SQfvBkB9u8bLhrj4RQP4I777SqzNLSl9/fNnfvOOjek= +github.com/compose-spec/compose-go v1.13.3 h1:6ap8P6WcCrRKKCufGwV43SIqr47Y2wnZncqIh7DwyU0= +github.com/compose-spec/compose-go v1.13.3/go.mod h1:rsiZ8uaOHJYJemDBzTe9UBpaq5ZFVEOO4TxM2G3SJxk= github.com/containerd/cgroups v1.0.4 h1:jN/mbWBEaz+T1pi5OFtnkQ+8qnmEbAr1Oo1FRm5B0dA= github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw= github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= @@ -447,8 +447,8 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.14 h1:fOqeC1+nCuuk6PKQdg9YmosXX7Y7mHX6R/0ZldI9iHo= -github.com/imdario/mergo v0.3.14/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= +github.com/imdario/mergo v0.3.15 h1:M8XP7IuFNsqUx6VPK2P9OSmsYsI/YFaGil0uD21V3dM= +github.com/imdario/mergo v0.3.15/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= github.com/in-toto/in-toto-golang v0.5.0 h1:hb8bgwr0M2hGdDsLjkJ3ZqJ8JFLL/tgYdAxF/XEFBbY= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= diff --git a/pkg/compose/build.go b/pkg/compose/build.go index 131203b9..be176bba 100644 --- a/pkg/compose/build.go +++ b/pkg/compose/build.go @@ -433,10 +433,10 @@ func getImageBuildLabels(project *types.Project, service types.ServiceConfig) ty return ret } -func toBuildContexts(additionalContexts map[string]*string) map[string]build.NamedContext { +func toBuildContexts(additionalContexts types.Mapping) map[string]build.NamedContext { namedContexts := map[string]build.NamedContext{} - for name, buildContext := range additionalContexts { - namedContexts[name] = build.NamedContext{Path: *buildContext} + for name, context := range additionalContexts { + namedContexts[name] = build.NamedContext{Path: context} } return namedContexts } diff --git a/pkg/compose/create.go b/pkg/compose/create.go index e35c4167..0047b30a 100644 --- a/pkg/compose/create.go +++ b/pkg/compose/create.go @@ -659,25 +659,25 @@ func setBlkio(blkio *types.BlkioConfig, resources *container.Resources) { for _, b := range blkio.DeviceReadBps { resources.BlkioDeviceReadBps = append(resources.BlkioDeviceReadBps, &blkiodev.ThrottleDevice{ Path: b.Path, - Rate: b.Rate, + Rate: uint64(b.Rate), }) } for _, b := range blkio.DeviceReadIOps { resources.BlkioDeviceReadIOps = append(resources.BlkioDeviceReadIOps, &blkiodev.ThrottleDevice{ Path: b.Path, - Rate: b.Rate, + Rate: uint64(b.Rate), }) } for _, b := range blkio.DeviceWriteBps { resources.BlkioDeviceWriteBps = append(resources.BlkioDeviceWriteBps, &blkiodev.ThrottleDevice{ Path: b.Path, - Rate: b.Rate, + Rate: uint64(b.Rate), }) } for _, b := range blkio.DeviceWriteIOps { resources.BlkioDeviceWriteIOps = append(resources.BlkioDeviceWriteIOps, &blkiodev.ThrottleDevice{ Path: b.Path, - Rate: b.Rate, + Rate: uint64(b.Rate), }) } }