tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

config --xx don't need `env_file` being parsed 

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2023-09-20 09:29:45 +02:00
parent 52a641bf6d
commit ab81db5bdb
No known key found for this signature in database
GPG Key ID: 9858809D6F8F6E7E
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/compose/config.go
View File

@ -50,8 +50,8 @@ type configOptions struct {
noConsistency bool noConsistency bool
} }
func (o *configOptions) ToProject(ctx context.Context, dockerCli command.Cli, services []string) (*types.Project, error) { func (o *configOptions) ToProject(ctx context.Context, dockerCli command.Cli, services []string, po ...cli.ProjectOptionsFn) (*types.Project, error) {
return o.ProjectOptions.ToProject(dockerCli, services, po = append(po,
cli.WithInterpolation(!o.noInterpolate), cli.WithInterpolation(!o.noInterpolate),
cli.WithResolvedPaths(!o.noResolvePath), cli.WithResolvedPaths(!o.noResolvePath),
cli.WithNormalization(!o.noNormalize), cli.WithNormalization(!o.noNormalize),
@ -59,6 +59,7 @@ func (o *configOptions) ToProject(ctx context.Context, dockerCli command.Cli, se
cli.WithDefaultProfiles(o.Profiles...), cli.WithDefaultProfiles(o.Profiles...),
cli.WithDiscardEnvFile, cli.WithDiscardEnvFile,
cli.WithContext(ctx)) cli.WithContext(ctx))
return o.ProjectOptions.ToProject(dockerCli, services, po...)
} }
func configCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service) *cobra.Command { func configCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service) *cobra.Command {
@ -154,7 +155,7 @@ func runConfig(ctx context.Context, dockerCli command.Cli, backend api.Service,
} }
func runServices(ctx context.Context, dockerCli command.Cli, opts configOptions) error { func runServices(ctx context.Context, dockerCli command.Cli, opts configOptions) error {
project, err := opts.ToProject(ctx, dockerCli, nil) project, err := opts.ToProject(ctx, dockerCli, nil, cli.WithoutEnvironmentResolution)
if err != nil { if err != nil {
return err return err
} }
@ -165,7 +166,7 @@ func runServices(ctx context.Context, dockerCli command.Cli, opts configOptions)
} }
func runVolumes(ctx context.Context, dockerCli command.Cli, opts configOptions) error { func runVolumes(ctx context.Context, dockerCli command.Cli, opts configOptions) error {
project, err := opts.ToProject(ctx, dockerCli, nil) project, err := opts.ToProject(ctx, dockerCli, nil, cli.WithoutEnvironmentResolution)
if err != nil { if err != nil {
return err return err
} }
@ -180,7 +181,7 @@ func runHash(ctx context.Context, dockerCli command.Cli, opts configOptions) err
if opts.hash != "*" { if opts.hash != "*" {
services = append(services, strings.Split(opts.hash, ",")...) services = append(services, strings.Split(opts.hash, ",")...)
} }
project, err := opts.ToProject(ctx, dockerCli, nil) project, err := opts.ToProject(ctx, dockerCli, nil, cli.WithoutEnvironmentResolution)
if err != nil { if err != nil {
return err return err
} }
@ -209,7 +210,7 @@ func runHash(ctx context.Context, dockerCli command.Cli, opts configOptions) err
func runProfiles(ctx context.Context, dockerCli command.Cli, opts configOptions, services []string) error { func runProfiles(ctx context.Context, dockerCli command.Cli, opts configOptions, services []string) error {
set := map[string]struct{}{} set := map[string]struct{}{}
project, err := opts.ToProject(ctx, dockerCli, services) project, err := opts.ToProject(ctx, dockerCli, services, cli.WithoutEnvironmentResolution)
if err != nil { if err != nil {
return err return err
} }
@ -230,7 +231,7 @@ func runProfiles(ctx context.Context, dockerCli command.Cli, opts configOptions,
} }
func runConfigImages(ctx context.Context, dockerCli command.Cli, opts configOptions, services []string) error { func runConfigImages(ctx context.Context, dockerCli command.Cli, opts configOptions, services []string) error {
project, err := opts.ToProject(ctx, dockerCli, services) project, err := opts.ToProject(ctx, dockerCli, services, cli.WithoutEnvironmentResolution)
if err != nil { if err != nil {
return err return err
} }