rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-01 14:48:55 +00:00
Code Issues Releases Wiki Activity

Fix naming of external services (e.g. specified by rancher.services_include)

Browse Source 
Add container_name key to service configuration.
This commit is contained in:
Ivan Mikushin
2015-12-17 18:30:16 +05:00
parent 0fc5fcca09
commit f4f59e97cc
5 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
compose/project.go
View File

@@ -94,6 +94,19 @@ func addServices(p *project.Project, enabled map[interface{}]interface{}, config
return enabled
}
func adjustContainerNames(m map[interface{}]interface{}) map[interface{}]interface{} {
for k, v := range m {
if k, ok := k.(string); ok {
if v, ok := v.(map[interface{}]interface{}); ok {
if _, ok := v["container_name"]; !ok {
v["container_name"] = k
}
}
}
}
return m
}
func newCoreServiceProject(cfg *config.CloudConfig, network bool) (*project.Project, error) {
projectEvents := make(chan project.Event)
enabled := map[interface{}]interface{}{}
@@ -135,7 +148,7 @@ func newCoreServiceProject(cfg *config.CloudConfig, network bool) (*project.Proj
log.Errorf("Failed to parse YAML configuration: %s : %v", service, err)
continue
}
bytes, err = yaml.Marshal(config.StringifyValues(m))
bytes, err = yaml.Marshal(adjustContainerNames(config.StringifyValues(m)))
if err != nil {
log.Errorf("Failed to marshal YAML configuration: %s : %v", service, err)
continue