tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-26 15:14:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

introduce --parallel and --no-parallel (hidden, deprecated) flags for backward compatibility

Browse Source 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2021-03-19 13:37:26 +01:00
parent 3366131096
commit 2acce2805b
No known key found for this signature in database
GPG Key ID: 9858809D6F8F6E7E
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cli/cmd/compose/compose.go
View File

@ -18,6 +18,7 @@ package compose
import ( import (
"fmt" "fmt"
"os"
"github.com/compose-spec/compose-go/cli" "github.com/compose-spec/compose-go/cli"
"github.com/compose-spec/compose-go/types" "github.com/compose-spec/compose-go/types"
@ -113,7 +114,7 @@ func Command(contextType string) *cobra.Command {
return errors.New(aec.Apply(`cannot specify DEPRECATED "--workdir" and "--project-directory". Please use only "--project-directory" instead.`, aec.RedF)) return errors.New(aec.Apply(`cannot specify DEPRECATED "--workdir" and "--project-directory". Please use only "--project-directory" instead.`, aec.RedF))
} }
opts.ProjectDir = opts.WorkDir opts.ProjectDir = opts.WorkDir
fmt.Println(aec.Apply(`option "--workdir" is DEPRECATED at root level! Please use "--project-directory" instead.`, aec.RedF)) fmt.Fprint(os.Stderr, aec.Apply(`option "--workdir" is DEPRECATED at root level! Please use "--project-directory" instead.\n`, aec.RedF))
} }
if contextType == store.DefaultContextType || contextType == store.LocalContextType { if contextType == store.DefaultContextType || contextType == store.LocalContextType {
Warning = "The new 'docker compose' command is currently experimental. " + Warning = "The new 'docker compose' command is currently experimental. " +

15
cli/cmd/compose/pull.go
View File

@ -18,7 +18,10 @@ package compose
import ( import (
"context" "context"
"fmt"
"os"
"github.com/morikuni/aec"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/docker/compose-cli/api/client" "github.com/docker/compose-cli/api/client"
@ -29,6 +32,8 @@ type pullOptions struct {
*projectOptions *projectOptions
composeOptions composeOptions
quiet bool quiet bool
parallel bool
noParallel bool
includeDeps bool includeDeps bool
} }
@ -40,11 +45,19 @@ func pullCommand(p *projectOptions) *cobra.Command {
Use: "pull [SERVICE...]", Use: "pull [SERVICE...]",
Short: "Pull service images", Short: "Pull service images",
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
if opts.noParallel {
fmt.Fprint(os.Stderr, aec.Apply(`option "--no-parallel" is DEPRECATED and will be ignored.\n`, aec.RedF))
}
return runPull(cmd.Context(), opts, args) return runPull(cmd.Context(), opts, args)
}, },
} }
cmd.Flags().BoolVarP(&opts.quiet, "quiet", "q", false, "Pull without printing progress information") flags := cmd.Flags()
flags.BoolVarP(&opts.quiet, "quiet", "q", false, "Pull without printing progress information")
cmd.Flags().BoolVar(&opts.includeDeps, "include-deps", false, "Also pull services declared as dependencies") cmd.Flags().BoolVar(&opts.includeDeps, "include-deps", false, "Also pull services declared as dependencies")
cmd.Flags().BoolVar(&opts.parallel, "parallel", true, "DEPRECATED pull multiple images in parallel.")
flags.MarkHidden("parallel") //nolint:errcheck
cmd.Flags().BoolVar(&opts.parallel, "no-parallel", true, "DEPRECATED disable parallel pulling.")
flags.MarkHidden("no-parallel") //nolint:errcheck
return cmd return cmd
} }