Remzona54/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2026-08-31 23:03:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #529 from docker/api

Browse source 
Revisit compose API so it uses compose-go Project as parameter
This commit is contained in:
Guillaume Tardif 2020-08-27 11:52:27 +02:00 • committed by GitHub
commit f80e90caca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 87 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

17
cli/cmd/compose/compose.go
View file

@ -34,6 +34,23 @@ type composeOptions struct {
Environment []string
}
func (o *composeOptions) toProjectName() (string, error) {
if o.Name != "" {
return o.Name, nil
}
options, err := o.toProjectOptions()
if err != nil {
return "", err
}
project, err := cli.ProjectFromOptions(options)
if err != nil {
return "", err
}
return project.Name, nil
}
func (o *composeOptions) toProjectOptions() (*cli.ProjectOptions, error) {
return cli.NewProjectOptions(o.ConfigPaths,
cli.WithOsEnv,

22
cli/cmd/compose/convert.go
View file

@ -32,27 +32,35 @@ func convertCommand() *cobra.Command {
Use: "convert",
Short: "Converts the compose file to a cloud format (default: cloudformation)",
RunE: func(cmd *cobra.Command, args []string) error {
options, err := opts.toProjectOptions()
if err != nil {
return err
}
return runConvert(cmd.Context(), options)
return runConvert(cmd.Context(), opts)
},
}
convertCmd.Flags().StringVarP(&opts.Name, "project-name", "p", "", "Project name")
convertCmd.Flags().StringVar(&opts.WorkingDir, "workdir", "", "Work dir")
convertCmd.Flags().StringArrayVarP(&opts.ConfigPaths, "file", "f", []string{}, "Compose configuration files")
convertCmd.Flags().StringArrayVarP(&opts.Environment, "environment", "e", []string{}, "Environment variables")
return convertCmd
}
func runConvert(ctx context.Context, opts *cli.ProjectOptions) error {
func runConvert(ctx context.Context, opts composeOptions) error {
var json []byte
c, err := client.New(ctx)
if err != nil {
return err
}
json, err = c.ComposeService().Convert(ctx, opts)
options, err := opts.toProjectOptions()
if err != nil {
return err
}
project, err := cli.ProjectFromOptions(options)
if err != nil {
return err
}
json, err = c.ComposeService().Convert(ctx, project)
if err != nil {
return err
}

4
cli/cmd/compose/down.go
View file

@ -47,10 +47,10 @@ func runDown(ctx context.Context, opts composeOptions) error {
}
return progress.Run(ctx, func(ctx context.Context) error {
options, err := opts.toProjectOptions()
projectName, err := opts.toProjectName()
if err != nil {
return err
}
return c.ComposeService().Down(ctx, options)
return c.ComposeService().Down(ctx, projectName)
})
}

4
cli/cmd/compose/logs.go
View file

@ -46,9 +46,9 @@ func runLogs(ctx context.Context, opts composeOptions) error {
return err
}
options, err := opts.toProjectOptions()
projectName, err := opts.toProjectName()
if err != nil {
return err
}
return c.ComposeService().Logs(ctx, options, os.Stdout)
return c.ComposeService().Logs(ctx, projectName, os.Stdout)
}

5
cli/cmd/compose/ps.go
View file

@ -50,14 +50,15 @@ func runPs(ctx context.Context, opts composeOptions) error {
return err
}
options, err := opts.toProjectOptions()
projectName, err := opts.toProjectName()
if err != nil {
return err
}
serviceList, err := c.ComposeService().Ps(ctx, options)
serviceList, err := c.ComposeService().Ps(ctx, projectName)
if err != nil {
return err
}
err = printSection(os.Stdout, func(w io.Writer) {
for _, service := range serviceList {
fmt.Fprintf(w, "%s\t%s\t%d/%d\t%s\n", service.ID, service.Name, service.Replicas, service.Desired, strings.Join(service.Ports, ", "))

9
cli/cmd/compose/up.go
View file

@ -19,6 +19,8 @@ package compose
import (
"context"
"github.com/compose-spec/compose-go/cli"
"github.com/spf13/cobra"
"github.com/docker/compose-cli/client"
@ -53,6 +55,11 @@ func runUp(ctx context.Context, opts composeOptions) error {
if err != nil {
return err
}
return c.ComposeService().Up(ctx, options)
project, err := cli.ProjectFromOptions(options)
if err != nil {
return err
}
return c.ComposeService().Up(ctx, project)
})
}