Skip to content

Commit 759d3bc

Browse files
authored
Merge pull request #11647 from milas/revert-compose-go-201
chore(deps): revert "Bump compose-go to v2.0.1"
2 parents ad41461 + 26f687a commit 759d3bc

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/AlecAivazis/survey/v2 v2.3.7
77
github.com/Microsoft/go-winio v0.6.1
88
github.com/buger/goterm v1.0.4
9-
github.com/compose-spec/compose-go/v2 v2.0.1
9+
github.com/compose-spec/compose-go/v2 v2.0.0
1010
github.com/containerd/console v1.0.3
1111
github.com/containerd/containerd v1.7.12
1212
github.com/davecgh/go-spew v1.1.1

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+g
8686
github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
8787
github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb h1:EDmT6Q9Zs+SbUoc7Ik9EfrFqcylYqgPZ9ANSbTAntnE=
8888
github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb/go.mod h1:ZjrT6AXHbDs86ZSdt/osfBi5qfexBrKUdONk989Wnk4=
89-
github.com/compose-spec/compose-go/v2 v2.0.1 h1:XIvwK9RltlwAikI1d8aOaGGTr0/i2Jev3LoRn2nLEmA=
90-
github.com/compose-spec/compose-go/v2 v2.0.1/go.mod h1:bEPizBkIojlQ20pi2vNluBa58tevvj0Y18oUSHPyfdc=
89+
github.com/compose-spec/compose-go/v2 v2.0.0 h1:RLI8GmNxRLg759CzZITh/kGYZTYhEak121FaVYdXTC8=
90+
github.com/compose-spec/compose-go/v2 v2.0.0/go.mod h1:bEPizBkIojlQ20pi2vNluBa58tevvj0Y18oUSHPyfdc=
9191
github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM=
9292
github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw=
9393
github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw=

pkg/compose/create.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -710,8 +710,10 @@ func setLimits(limits *types.Resource, resources *container.Resources) {
710710
if limits.MemoryBytes != 0 {
711711
resources.Memory = int64(limits.MemoryBytes)
712712
}
713-
if limits.NanoCPUs != 0 {
714-
resources.NanoCPUs = int64(limits.NanoCPUs * 1e9)
713+
if limits.NanoCPUs != "" {
714+
if f, err := strconv.ParseFloat(limits.NanoCPUs, 64); err == nil {
715+
resources.NanoCPUs = int64(f * 1e9)
716+
}
715717
}
716718
if limits.Pids > 0 {
717719
resources.PidsLimit = &limits.Pids

0 commit comments

Comments
 (0)