Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

some commands don't need Dependencies being checked #11050

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions cmd/compose/compose.go
Expand Up @@ -118,6 +118,7 @@ type ProjectOptions struct {
Compatibility bool
Progress string
Offline bool
Dependencies types.DependencyOption
}

// ProjectFunc does stuff within a types.Project
Expand Down Expand Up @@ -247,7 +248,7 @@ func (o *ProjectOptions) ToProject(dockerCli command.Cli, services []string, po

project.WithoutUnnecessaryResources()

err = project.ForServices(services)
err = project.ForServices(services, o.Dependencies)
return project, err
}

Expand Down Expand Up @@ -311,7 +312,9 @@ func RootCommand(dockerCli command.Cli, backend api.Service) *cobra.Command { //
"commandConn.CloseRead:",
))

opts := ProjectOptions{}
opts := ProjectOptions{
Dependencies: types.IncludeDependencies,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder IgnoreDependencies should be the default value, and we opt-in for dependencies in up/start/stop/down commands

}
var (
ansi string
noAnsi bool
Expand Down
1 change: 1 addition & 0 deletions cmd/compose/config.go
Expand Up @@ -63,6 +63,7 @@ func (o *configOptions) ToProject(ctx context.Context, dockerCli command.Cli, se
}

func configCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service) *cobra.Command {
p.Dependencies = types.IgnoreDependencies
opts := configOptions{
ProjectOptions: p,
}
Expand Down
2 changes: 2 additions & 0 deletions cmd/compose/cp.go
Expand Up @@ -20,6 +20,7 @@ import (
"context"
"errors"

"github.com/compose-spec/compose-go/types"
"github.com/docker/cli/cli"
"github.com/docker/cli/cli/command"
"github.com/spf13/cobra"
Expand All @@ -39,6 +40,7 @@ type copyOptions struct {
}

func copyCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service) *cobra.Command {
p.Dependencies = types.IgnoreDependencies
opts := copyOptions{
ProjectOptions: p,
}
Expand Down
8 changes: 4 additions & 4 deletions cmd/compose/events.go
Expand Up @@ -21,22 +21,22 @@ import (
"encoding/json"
"fmt"

"github.com/compose-spec/compose-go/types"
"github.com/docker/cli/cli/command"
"github.com/docker/compose/v2/pkg/api"

"github.com/spf13/cobra"
)

type eventsOpts struct {
*composeOptions
*ProjectOptions
json bool
}

func eventsCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service) *cobra.Command {
p.Dependencies = types.IgnoreDependencies
opts := eventsOpts{
composeOptions: &composeOptions{
ProjectOptions: p,
},
ProjectOptions: p,
}
cmd := &cobra.Command{
Use: "events [OPTIONS] [SERVICE...]",
Expand Down
9 changes: 4 additions & 5 deletions cmd/compose/exec.go
Expand Up @@ -28,7 +28,7 @@ import (
)

type execOpts struct {
*composeOptions
*ProjectOptions

service string
command []string
Expand All @@ -44,10 +44,9 @@ type execOpts struct {
}

func execCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service) *cobra.Command {
p.Dependencies = types.IgnoreDependencies
opts := execOpts{
composeOptions: &composeOptions{
ProjectOptions: p,
},
ProjectOptions: p,
}
runCmd := &cobra.Command{
Use: "exec [OPTIONS] SERVICE COMMAND [ARGS...]",
Expand Down Expand Up @@ -86,7 +85,7 @@ func runExec(ctx context.Context, dockerCli command.Cli, backend api.Service, op
if err != nil {
return err
}
projectOptions, err := opts.composeOptions.toProjectOptions()
projectOptions, err := opts.toProjectOptions()
if err != nil {
return err
}
Expand Down
2 changes: 2 additions & 0 deletions cmd/compose/images.go
Expand Up @@ -23,6 +23,7 @@ import (
"sort"
"strings"

"github.com/compose-spec/compose-go/types"
"github.com/docker/cli/cli/command"
"github.com/docker/docker/pkg/stringid"
"github.com/docker/go-units"
Expand All @@ -40,6 +41,7 @@ type imageOptions struct {
}

func imagesCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service) *cobra.Command {
p.Dependencies = types.IgnoreDependencies
opts := imageOptions{
ProjectOptions: p,
}
Expand Down
2 changes: 2 additions & 0 deletions cmd/compose/kill.go
Expand Up @@ -20,6 +20,7 @@ import (
"context"
"os"

"github.com/compose-spec/compose-go/types"
"github.com/docker/cli/cli/command"
"github.com/spf13/cobra"

Expand All @@ -34,6 +35,7 @@ type killOptions struct {
}

func killCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service) *cobra.Command {
p.Dependencies = types.IgnoreDependencies
opts := killOptions{
ProjectOptions: p,
}
Expand Down
3 changes: 2 additions & 1 deletion cmd/compose/logs.go
Expand Up @@ -19,6 +19,7 @@ package compose
import (
"context"

"github.com/compose-spec/compose-go/types"
"github.com/docker/cli/cli/command"
"github.com/spf13/cobra"

Expand All @@ -28,7 +29,6 @@ import (

type logsOptions struct {
*ProjectOptions
composeOptions
follow bool
tail string
since string
Expand All @@ -39,6 +39,7 @@ type logsOptions struct {
}

func logsCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service) *cobra.Command {
p.Dependencies = types.IgnoreDependencies
opts := logsOptions{
ProjectOptions: p,
}
Expand Down
3 changes: 3 additions & 0 deletions cmd/compose/pause.go
Expand Up @@ -19,6 +19,7 @@ package compose
import (
"context"

"github.com/compose-spec/compose-go/types"
"github.com/docker/cli/cli/command"
"github.com/spf13/cobra"

Expand All @@ -30,6 +31,7 @@ type pauseOptions struct {
}

func pauseCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service) *cobra.Command {
p.Dependencies = types.IgnoreDependencies
opts := pauseOptions{
ProjectOptions: p,
}
Expand Down Expand Up @@ -61,6 +63,7 @@ type unpauseOptions struct {
}

func unpauseCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service) *cobra.Command {
p.Dependencies = types.IgnoreDependencies
opts := unpauseOptions{
ProjectOptions: p,
}
Expand Down
2 changes: 2 additions & 0 deletions cmd/compose/port.go
Expand Up @@ -22,6 +22,7 @@ import (
"strconv"
"strings"

"github.com/compose-spec/compose-go/types"
"github.com/docker/cli/cli/command"
"github.com/spf13/cobra"

Expand All @@ -36,6 +37,7 @@ type portOptions struct {
}

func portCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service) *cobra.Command {
p.Dependencies = types.IgnoreDependencies
opts := portOptions{
ProjectOptions: p,
}
Expand Down
2 changes: 2 additions & 0 deletions cmd/compose/ps.go
Expand Up @@ -23,6 +23,7 @@ import (
"sort"
"strings"

"github.com/compose-spec/compose-go/types"
"github.com/docker/compose/v2/cmd/formatter"
"github.com/docker/compose/v2/pkg/api"
"github.com/docker/compose/v2/pkg/utils"
Expand Down Expand Up @@ -64,6 +65,7 @@ func (p *psOptions) parseFilter() error {
}

func psCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service) *cobra.Command {
p.Dependencies = types.IgnoreDependencies
opts := psOptions{
ProjectOptions: p,
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/compose/pull.go
Expand Up @@ -31,7 +31,6 @@ import (

type pullOptions struct {
*ProjectOptions
composeOptions
quiet bool
parallel bool
noParallel bool
Expand All @@ -42,6 +41,7 @@ type pullOptions struct {
}

func pullCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service) *cobra.Command {
p.Dependencies = types.IgnoreDependencies
opts := pullOptions{
ProjectOptions: p,
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/compose/push.go
Expand Up @@ -28,13 +28,13 @@ import (

type pushOptions struct {
*ProjectOptions
composeOptions
IncludeDeps bool
Ignorefailures bool
Quiet bool
}

func pushCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service) *cobra.Command {
p.Dependencies = types.IgnoreDependencies
opts := pushOptions{
ProjectOptions: p,
}
Expand Down
2 changes: 2 additions & 0 deletions cmd/compose/remove.go
Expand Up @@ -19,6 +19,7 @@ package compose
import (
"context"

"github.com/compose-spec/compose-go/types"
"github.com/docker/cli/cli/command"
"github.com/docker/compose/v2/pkg/api"
"github.com/spf13/cobra"
Expand All @@ -32,6 +33,7 @@ type removeOptions struct {
}

func removeCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service) *cobra.Command {
p.Dependencies = types.IgnoreDependencies
opts := removeOptions{
ProjectOptions: p,
}
Expand Down
10 changes: 4 additions & 6 deletions cmd/compose/run.go
Expand Up @@ -39,7 +39,7 @@ import (
)

type runOptions struct {
*composeOptions
*ProjectOptions
Service string
Command []string
environment []string
Expand Down Expand Up @@ -114,11 +114,9 @@ func (options runOptions) apply(project *types.Project) error {

func runCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service) *cobra.Command {
options := runOptions{
composeOptions: &composeOptions{
ProjectOptions: p,
},
capAdd: opts.NewListOpts(nil),
capDrop: opts.NewListOpts(nil),
ProjectOptions: p,
capAdd: opts.NewListOpts(nil),
capDrop: opts.NewListOpts(nil),
}
createOpts := createOptions{}
buildOpts := buildOptions{
Expand Down
1 change: 1 addition & 0 deletions cmd/compose/scale.go
Expand Up @@ -37,6 +37,7 @@ type scaleOptions struct {
}

func scaleCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service) *cobra.Command {
p.Dependencies = types.IgnoreDependencies
opts := scaleOptions{
ProjectOptions: p,
}
Expand Down
2 changes: 2 additions & 0 deletions cmd/compose/top.go
Expand Up @@ -24,6 +24,7 @@ import (
"strings"
"text/tabwriter"

"github.com/compose-spec/compose-go/types"
"github.com/docker/cli/cli/command"
"github.com/spf13/cobra"

Expand All @@ -35,6 +36,7 @@ type topOptions struct {
}

func topCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service) *cobra.Command {
p.Dependencies = types.IgnoreDependencies
opts := topOptions{
ProjectOptions: p,
}
Expand Down
6 changes: 0 additions & 6 deletions cmd/compose/up.go
Expand Up @@ -34,13 +34,7 @@ import (
"github.com/docker/compose/v2/pkg/utils"
)

// composeOptions hold options common to `up` and `run` to run compose project
type composeOptions struct {
*ProjectOptions
}

type upOptions struct {
*composeOptions
Detach bool
noStart bool
noDeps bool
Expand Down
2 changes: 2 additions & 0 deletions cmd/compose/wait.go
Expand Up @@ -20,6 +20,7 @@ import (
"context"
"os"

"github.com/compose-spec/compose-go/types"
"github.com/docker/cli/cli"
"github.com/docker/cli/cli/command"
"github.com/docker/compose/v2/pkg/api"
Expand All @@ -35,6 +36,7 @@ type waitOptions struct {
}

func waitCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service) *cobra.Command {
p.Dependencies = types.IgnoreDependencies
opts := waitOptions{
ProjectOptions: p,
}
Expand Down