deep-stack/kompose
7
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity

Merge pull request #428 from surajssd/remove_unnecessary_objects

Browse Source 
removed unnecessary objects in compose.go
This commit is contained in:
Tomas Kral 2017-02-15 11:29:57 +01:00 committed by GitHub
commit fb042c7b20
1 changed files with 53 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
pkg/loader/compose/compose.go
View File

@ -307,72 +307,67 @@ func (c *Compose) LoadFile(files []string) kobject.KomposeObject {
logrus.Fatalf("Failed to load compose file: %v", err) logrus.Fatalf("Failed to load compose file: %v", err)
} }
// transform composeObject into komposeObject
composeServiceNames := composeObject.ServiceConfigs.Keys()
noSupKeys := checkUnsupportedKey(composeObject) noSupKeys := checkUnsupportedKey(composeObject)
for _, keyName := range noSupKeys { for _, keyName := range noSupKeys {
logrus.Warningf("Unsupported %s key - ignoring", keyName) logrus.Warningf("Unsupported %s key - ignoring", keyName)
} }
for _, name := range composeServiceNames { for name, composeServiceConfig := range composeObject.ServiceConfigs.All() {
if composeServiceConfig, ok := composeObject.ServiceConfigs.Get(name); ok { serviceConfig := kobject.ServiceConfig{}
serviceConfig := kobject.ServiceConfig{} serviceConfig.Image = composeServiceConfig.Image
serviceConfig.Image = composeServiceConfig.Image serviceConfig.Build = composeServiceConfig.Build.Context
serviceConfig.Build = composeServiceConfig.Build.Context serviceConfig.ContainerName = composeServiceConfig.ContainerName
serviceConfig.ContainerName = composeServiceConfig.ContainerName serviceConfig.Command = composeServiceConfig.Entrypoint
serviceConfig.Command = composeServiceConfig.Entrypoint serviceConfig.Args = composeServiceConfig.Command
serviceConfig.Args = composeServiceConfig.Command serviceConfig.Build = composeServiceConfig.Build.Context
serviceConfig.Build = composeServiceConfig.Build.Context
envs := loadEnvVars(composeServiceConfig.Environment) envs := loadEnvVars(composeServiceConfig.Environment)
serviceConfig.Environment = envs serviceConfig.Environment = envs
// load ports // load ports
ports, err := loadPorts(composeServiceConfig.Ports) ports, err := loadPorts(composeServiceConfig.Ports)
if err != nil { if err != nil {
logrus.Fatalf("%q failed to load ports from compose file: %v", name, err) logrus.Fatalf("%q failed to load ports from compose file: %v", name, err)
}
serviceConfig.Port = ports
serviceConfig.WorkingDir = composeServiceConfig.WorkingDir
if composeServiceConfig.Volumes != nil {
for _, volume := range composeServiceConfig.Volumes.Volumes {
serviceConfig.Volumes = append(serviceConfig.Volumes, volume.String())
}
}
// canonical "Custom Labels" handler
// Labels used to influence conversion of kompose will be handled
// from here for docker-compose. Each loader will have such handler.
for key, value := range composeServiceConfig.Labels {
switch key {
case "kompose.service.type":
serviceConfig.ServiceType = handleServiceType(value)
case "kompose.service.expose":
serviceConfig.ExposeService = strings.ToLower(value)
}
}
// convert compose labels to annotations
serviceConfig.Annotations = map[string]string(composeServiceConfig.Labels)
serviceConfig.CPUSet = composeServiceConfig.CPUSet
serviceConfig.CPUShares = int64(composeServiceConfig.CPUShares)
serviceConfig.CPUQuota = int64(composeServiceConfig.CPUQuota)
serviceConfig.CapAdd = composeServiceConfig.CapAdd
serviceConfig.CapDrop = composeServiceConfig.CapDrop
serviceConfig.Expose = composeServiceConfig.Expose
serviceConfig.Privileged = composeServiceConfig.Privileged
serviceConfig.Restart = composeServiceConfig.Restart
serviceConfig.User = composeServiceConfig.User
serviceConfig.VolumesFrom = composeServiceConfig.VolumesFrom
serviceConfig.Stdin = composeServiceConfig.StdinOpen
serviceConfig.Tty = composeServiceConfig.Tty
komposeObject.ServiceConfigs[name] = serviceConfig
} }
serviceConfig.Port = ports
serviceConfig.WorkingDir = composeServiceConfig.WorkingDir
if composeServiceConfig.Volumes != nil {
for _, volume := range composeServiceConfig.Volumes.Volumes {
serviceConfig.Volumes = append(serviceConfig.Volumes, volume.String())
}
}
// canonical "Custom Labels" handler
// Labels used to influence conversion of kompose will be handled
// from here for docker-compose. Each loader will have such handler.
for key, value := range composeServiceConfig.Labels {
switch key {
case "kompose.service.type":
serviceConfig.ServiceType = handleServiceType(value)
case "kompose.service.expose":
serviceConfig.ExposeService = strings.ToLower(value)
}
}
// convert compose labels to annotations
serviceConfig.Annotations = map[string]string(composeServiceConfig.Labels)
serviceConfig.CPUSet = composeServiceConfig.CPUSet
serviceConfig.CPUShares = int64(composeServiceConfig.CPUShares)
serviceConfig.CPUQuota = int64(composeServiceConfig.CPUQuota)
serviceConfig.CapAdd = composeServiceConfig.CapAdd
serviceConfig.CapDrop = composeServiceConfig.CapDrop
serviceConfig.Expose = composeServiceConfig.Expose
serviceConfig.Privileged = composeServiceConfig.Privileged
serviceConfig.Restart = composeServiceConfig.Restart
serviceConfig.User = composeServiceConfig.User
serviceConfig.VolumesFrom = composeServiceConfig.VolumesFrom
serviceConfig.Stdin = composeServiceConfig.StdinOpen
serviceConfig.Tty = composeServiceConfig.Tty
komposeObject.ServiceConfigs[name] = serviceConfig
} }
return komposeObject return komposeObject