1
0
mirror of https://github.com/rancher/os.git synced 2025-08-15 21:43:42 +00:00

Merge pull request #1163 from joshwget/fix-duplicate

Fix duplicate volumes_from when switching consoles
This commit is contained in:
Darren Shepherd 2016-08-18 15:32:38 -07:00 committed by GitHub
commit add2080fb2

View File

@ -4,6 +4,7 @@ import (
"os"
log "github.com/Sirupsen/logrus"
composeConfig "github.com/docker/libcompose/config"
"github.com/docker/libcompose/project/options"
"github.com/rancher/os/compose"
"github.com/rancher/os/config"
@ -24,6 +25,8 @@ func Main() {
}
if newConsole != "default" {
project.ServiceConfigs.Add("console", &composeConfig.ServiceConfig{})
if err = compose.LoadService(project, cfg, true, newConsole); err != nil {
log.Fatal(err)
}