From b3017199b67d5f69002d6dd3497b9fd308003b4f Mon Sep 17 00:00:00 2001 From: Tomas Kral Date: Wed, 17 Aug 2016 19:00:01 +0200 Subject: [PATCH] some items in libcompose ServiceConfig changed type --- pkg/loader/compose/compose.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkg/loader/compose/compose.go b/pkg/loader/compose/compose.go index 23fdc496..a02ff3f7 100644 --- a/pkg/loader/compose/compose.go +++ b/pkg/loader/compose/compose.go @@ -162,14 +162,19 @@ func (c *Compose) LoadFile(file string) kobject.KomposeObject { serviceConfig.Port = ports serviceConfig.WorkingDir = composeServiceConfig.WorkingDir - serviceConfig.Volumes = composeServiceConfig.Volumes + + if composeServiceConfig.Volumes != nil { + for _, volume := range composeServiceConfig.Volumes.Volumes { + serviceConfig.Volumes = append(serviceConfig.Volumes, volume.String()) + } + } // convert compose labels to annotations serviceConfig.Annotations = map[string]string(composeServiceConfig.Labels) serviceConfig.CPUSet = composeServiceConfig.CPUSet - serviceConfig.CPUShares = composeServiceConfig.CPUShares - serviceConfig.CPUQuota = composeServiceConfig.CPUQuota + serviceConfig.CPUShares = int64(composeServiceConfig.CPUShares) + serviceConfig.CPUQuota = int64(composeServiceConfig.CPUQuota) serviceConfig.CapAdd = composeServiceConfig.CapAdd serviceConfig.CapDrop = composeServiceConfig.CapDrop serviceConfig.Expose = composeServiceConfig.Expose