Skip to content

Commit

Permalink
fix SplitNs
Browse files Browse the repository at this point in the history
  • Loading branch information
csquared committed Jan 27, 2016
1 parent 92f3d06 commit 2790afe
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
8 changes: 6 additions & 2 deletions api/manifest/manifest.go
Expand Up @@ -929,13 +929,17 @@ func getLinkEntryEnv(linkEntry ManifestEntry) (map[string]string, error) {

for _, val := range inspect[0].Config.Env {
parts := strings.SplitN(val, "=", 2)
linkEntryEnv[parts[0]] = parts[1]
if len(parts) == 2 {
linkEntryEnv[parts[0]] = parts[1]
}
}

//override with manifest env
for _, value := range linkEntry.EnvironmentArray() {
parts := strings.SplitN(value, "=", 2)
linkEntryEnv[parts[0]] = parts[1]
if len(parts) == 2 {
linkEntryEnv[parts[0]] = parts[1]
}
}

return linkEntryEnv, nil
Expand Down
6 changes: 4 additions & 2 deletions api/models/release.go
Expand Up @@ -358,8 +358,10 @@ func (r *Release) resolveLinks(manifest *Manifest) (Manifest, error) {
for _, val := range linkableEnvs {
if strings.HasPrefix(val, "LINK_") {
parts := strings.SplitN(val, "=", 2)
entry.Exports[parts[0]] = parts[1]
m[i] = entry
if len(parts) == 2 {
entry.Exports[parts[0]] = parts[1]
m[i] = entry
}
}
}
}
Expand Down

0 comments on commit 2790afe

Please sign in to comment.