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

support both : and = as envvar separators

Browse Source
This commit is contained in:
Tuna 2016-10-10 17:41:34 +02:00
parent 327f96943e
commit 1fdaffe540
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,14 +36,27 @@ type Compose struct {
} }
// load environment variables from compose file // load environment variables from compose file
func loadEnvVars(e map[string]string) []kobject.EnvVar { func loadEnvVars(envars []string) []kobject.EnvVar {
envs := []kobject.EnvVar{} envs := []kobject.EnvVar{}
for k, v := range e { var character string
for _, e := range envars {
//FIXME:(tuna) if envvar string contains both = and :, then = will be first pick up. Consider the case: URL=http://examples.com
if strings.Contains(e, "=") {
character = "="
} else if strings.Contains(e, ":") {
character = ":"
} else {
logrus.Errorf("Invalid environment variable format, only : and = separators are supported")
return []kobject.EnvVar{}
}
values := strings.Split(e, character)
envs = append(envs, kobject.EnvVar{ envs = append(envs, kobject.EnvVar{
Name: k, Name: values[0],
Value: v, Value: values[1],
}) })
} }
return envs return envs
} }
@ -163,7 +176,8 @@ func (c *Compose) LoadFile(file string) kobject.KomposeObject {
serviceConfig.Command = composeServiceConfig.Entrypoint serviceConfig.Command = composeServiceConfig.Entrypoint
serviceConfig.Args = composeServiceConfig.Command serviceConfig.Args = composeServiceConfig.Command
envs := loadEnvVars(composeServiceConfig.Environment.ToMap()) //envs := loadEnvVars(composeServiceConfig.Environment.ToMap())
envs := loadEnvVars(composeServiceConfig.Environment)
serviceConfig.Environment = envs serviceConfig.Environment = envs
// load ports // load ports