Skip to content

Commit 9e7bea3

Browse files
authored
Merge pull request #41 from gondor/master
fix compile issues
2 parents 8a43475 + b0516a5 commit 9e7bea3

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

compose/compose_wrapper.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"github.com/ContainX/depcon/pkg/envsubst"
77
"github.com/docker/distribution/context"
88
"github.com/docker/libcompose/docker"
9+
"github.com/docker/libcompose/docker/ctx"
910
"github.com/docker/libcompose/project"
1011
"github.com/docker/libcompose/project/options"
1112
"io/ioutil"
@@ -96,8 +97,8 @@ func (c *ComposeWrapper) Port(index int, proto, service, port string) error {
9697
}
9798

9899
func (c *ComposeWrapper) PS(quiet bool) error {
99-
if allInfo, err := c.project.Ps(context.Background(), quiet); err == nil {
100-
os.Stdout.WriteString(allInfo.String(!quiet))
100+
if allInfo, err := c.project.Ps(context.Background()); err == nil {
101+
os.Stdout.WriteString(allInfo.String([]string{"Name", "Command", "State", "Ports"}, !quiet))
101102
}
102103
return nil
103104
}
@@ -125,8 +126,7 @@ func (c *ComposeWrapper) createDockerContext() (project.APIProject, error) {
125126
}
126127
c.context.ComposeFile = file.Name()
127128
}
128-
129-
return docker.NewProject(&docker.Context{
129+
return docker.NewProject(&ctx.Context{
130130
Context: project.Context{
131131
ComposeFiles: strings.Split(c.context.ComposeFile, ","),
132132
ProjectName: c.context.ProjectName,

0 commit comments

Comments
 (0)