Merge pull request #41 from gondor/master

fix compile issues
ContainX · Sep 15, 2016 · 9e7bea3 · 9e7bea3
2 parents 8a43475 + b0516a5
commit 9e7bea3
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/compose/compose_wrapper.go b/compose/compose_wrapper.go
@@ -6,6 +6,7 @@ import (
 	"github.com/ContainX/depcon/pkg/envsubst"
 	"github.com/docker/distribution/context"
 	"github.com/docker/libcompose/docker"
+	"github.com/docker/libcompose/docker/ctx"
 	"github.com/docker/libcompose/project"
 	"github.com/docker/libcompose/project/options"
 	"io/ioutil"
@@ -96,8 +97,8 @@ func (c *ComposeWrapper) Port(index int, proto, service, port string) error {
 }
 
 func (c *ComposeWrapper) PS(quiet bool) error {
-	if allInfo, err := c.project.Ps(context.Background(), quiet); err == nil {
-		os.Stdout.WriteString(allInfo.String(!quiet))
+	if allInfo, err := c.project.Ps(context.Background()); err == nil {
+		os.Stdout.WriteString(allInfo.String([]string{"Name", "Command", "State", "Ports"}, !quiet))
 	}
 	return nil
 }
@@ -125,8 +126,7 @@ func (c *ComposeWrapper) createDockerContext() (project.APIProject, error) {
 		}
 		c.context.ComposeFile = file.Name()
 	}
-
-	return docker.NewProject(&docker.Context{
+	return docker.NewProject(&ctx.Context{
 		Context: project.Context{
 			ComposeFiles: strings.Split(c.context.ComposeFile, ","),
 			ProjectName:  c.context.ProjectName,