deep-stack/kompose
7
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity

Merge pull request #142 from ngtuna/project-context

Browse Source 
Use libcompose project.Context{} instead of docker.Context{}
This commit is contained in:
Tuna 2016-09-07 11:38:46 +07:00 committed by GitHub
commit c3ff0524de
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/loader/compose/compose.go
View File

@ -27,7 +27,6 @@ import (
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/docker/libcompose/config" "github.com/docker/libcompose/config"
"github.com/docker/libcompose/docker"
"github.com/docker/libcompose/lookup" "github.com/docker/libcompose/lookup"
"github.com/docker/libcompose/project" "github.com/docker/libcompose/project"
"github.com/skippbox/kompose/pkg/kobject" "github.com/skippbox/kompose/pkg/kobject"
@ -92,7 +91,7 @@ func (c *Compose) LoadFile(file string) kobject.KomposeObject {
komposeObject := kobject.KomposeObject{ komposeObject := kobject.KomposeObject{
ServiceConfigs: make(map[string]kobject.ServiceConfig), ServiceConfigs: make(map[string]kobject.ServiceConfig),
} }
context := &docker.Context{} context := &project.Context{}
if file == "" { if file == "" {
file = "docker-compose.yml" file = "docker-compose.yml"
} }
@ -118,8 +117,7 @@ func (c *Compose) LoadFile(file string) kobject.KomposeObject {
} }
// load compose file into composeObject // load compose file into composeObject
composeObject := project.NewProject(&context.Context, nil, nil) composeObject := project.NewProject(context, nil, nil)
err := composeObject.Parse() err := composeObject.Parse()
if err != nil { if err != nil {
logrus.Fatalf("Failed to load compose file: %v", err) logrus.Fatalf("Failed to load compose file: %v", err)