rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-05 16:52:20 +00:00
Code Issues Releases Wiki Activity

Shim to support services depending on cloud-init service

Browse Source
This commit is contained in:
Josh Curl
2016-11-03 13:27:15 -07:00
parent 33b6145162
commit 72f7f9a572
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docker/service_factory.go
View File

@@ -15,11 +15,17 @@ type ServiceFactory struct {
func (s *ServiceFactory) Create(project *project.Project, name string, serviceConfig *composeConfig.ServiceConfig) (project.Service, error) { func (s *ServiceFactory) Create(project *project.Project, name string, serviceConfig *composeConfig.ServiceConfig) (project.Service, error) {
if after := serviceConfig.Labels["io.rancher.os.after"]; after != "" { if after := serviceConfig.Labels["io.rancher.os.after"]; after != "" {
for _, dep := range util.TrimSplit(after, ",") { for _, dep := range util.TrimSplit(after, ",") {
if dep == "cloud-init" {
dep = "cloud-init-execute"
}
s.Deps[name] = append(s.Deps[name], dep) s.Deps[name] = append(s.Deps[name], dep)
} }
} }
if before := serviceConfig.Labels["io.rancher.os.before"]; before != "" { if before := serviceConfig.Labels["io.rancher.os.before"]; before != "" {
for _, dep := range util.TrimSplit(before, ",") { for _, dep := range util.TrimSplit(before, ",") {
if dep == "cloud-init" {
dep = "cloud-init-execute"
}
s.Deps[dep] = append(s.Deps[dep], name) s.Deps[dep] = append(s.Deps[dep], name)
} }
} }