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

Support inherited environment vars on exec 

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
This commit is contained in:
Ulysses Souza 2021-11-05 18:58:40 +01:00 committed by Nicolas De loof
parent 125752c127
commit a79346b978
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/compose/exec.go
View File

@ -21,11 +21,12 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/compose-spec/compose-go/types"
"github.com/containerd/console" "github.com/containerd/console"
"github.com/docker/cli/cli" "github.com/docker/cli/cli"
"github.com/spf13/cobra"
"github.com/docker/compose/v2/pkg/api" "github.com/docker/compose/v2/pkg/api"
"github.com/docker/compose/v2/pkg/compose"
"github.com/spf13/cobra"
) )
type execOpts struct { type execOpts struct {
@ -77,15 +78,22 @@ func execCommand(p *projectOptions, backend api.Service) *cobra.Command {
} }
func runExec(ctx context.Context, backend api.Service, opts execOpts) error { func runExec(ctx context.Context, backend api.Service, opts execOpts) error {
project, err := opts.toProjectName() projectName, err := opts.toProjectName()
if err != nil { if err != nil {
return err return err
} }
projectOptions, err := opts.composeOptions.toProjectOptions()
if err != nil {
return err
}
lookupFn := func(k string) (string, bool) {
v, ok := projectOptions.Environment[k]
return v, ok
}
execOpts := api.RunOptions{ execOpts := api.RunOptions{
Service: opts.service, Service: opts.service,
Command: opts.command, Command: opts.command,
Environment: opts.environment, Environment: compose.ToMobyEnv(types.NewMappingWithEquals(opts.environment).Resolve(lookupFn)),
Tty: !opts.noTty, Tty: !opts.noTty,
User: opts.user, User: opts.user,
Privileged: opts.privileged, Privileged: opts.privileged,
@ -113,7 +121,7 @@ func runExec(ctx context.Context, backend api.Service, opts execOpts) error {
execOpts.Stdout = con execOpts.Stdout = con
execOpts.Stderr = con execOpts.Stderr = con
} }
exitCode, err := backend.Exec(ctx, project, execOpts) exitCode, err := backend.Exec(ctx, projectName, execOpts)
if exitCode != 0 { if exitCode != 0 {
errMsg := "" errMsg := ""
if err != nil { if err != nil {