rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-17 07:30:42 +00:00
Code Issues Releases Wiki Activity

cache the user/system client if its created

Browse Source 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit
2017-07-21 09:50:31 +10:00
parent 3de5a836c9
commit d244043ce7
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
compose/project.go
View File

@@ -248,20 +248,27 @@ func StageServices(cfg *config.CloudConfig, services ...string) error {
// Reduce service configurations to just image and labels // Reduce service configurations to just image and labels
needToPull := false needToPull := false
var client, userClient, systemClient dockerClient.APIClient
for _, serviceName := range p.ServiceConfigs.Keys() { for _, serviceName := range p.ServiceConfigs.Keys() {
serviceConfig, _ := p.ServiceConfigs.Get(serviceName) serviceConfig, _ := p.ServiceConfigs.Get(serviceName)
// test to see if we need to Pull // test to see if we need to Pull
var client dockerClient.APIClient
if serviceConfig.Labels[config.ScopeLabel] != config.System { if serviceConfig.Labels[config.ScopeLabel] != config.System {
client, err = rosDocker.NewDefaultClient() if userClient == nil {
if err != nil { userClient, err = rosDocker.NewDefaultClient()
log.Error(err) if err != nil {
log.Error(err)
}
} }
client = userClient
} else { } else {
client, err = rosDocker.NewSystemClient() if systemClient == nil {
if err != nil { systemClient, err = rosDocker.NewSystemClient()
log.Error(err) if err != nil {
log.Error(err)
}
client = systemClient
} }
} }
if client != nil { if client != nil {