Skip to content

Commit 2d482e6

Browse files
ndeloofglours
authored andcommitted
propagate docker endpoint to bake using DOCKER_* env variables
Signed-off-by: Nicolas De Loof <[email protected]>
1 parent c75418e commit 2d482e6

File tree

3 files changed

+60
-18
lines changed

3 files changed

+60
-18
lines changed

pkg/compose/build_bake.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,12 @@ func (s *composeService) doBuildBake(ctx context.Context, project *types.Project
335335
if err != nil {
336336
return nil, err
337337
}
338+
endpoint, cleanup, err := s.propagateDockerEndpoint()
339+
if err != nil {
340+
return nil, err
341+
}
342+
cmd.Env = append(cmd.Env, endpoint...)
343+
defer cleanup()
338344

339345
cmd.Stdout = s.stdout()
340346
cmd.Stdin = bytes.NewBuffer(b)

pkg/compose/model.go

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ func (s *composeService) ensureModels(ctx context.Context, project *types.Projec
4343
if err != nil {
4444
return err
4545
}
46+
defer api.Close()
4647
availableModels, err := api.ListModels(ctx)
4748

4849
eg, ctx := errgroup.WithContext(ctx)
@@ -72,6 +73,7 @@ type modelAPI struct {
7273
path string
7374
env []string
7475
prepare func(ctx context.Context, cmd *exec.Cmd) error
76+
cleanup func()
7577
}
7678

7779
func (s *composeService) newModelAPI(project *types.Project) (*modelAPI, error) {
@@ -82,15 +84,24 @@ func (s *composeService) newModelAPI(project *types.Project) (*modelAPI, error)
8284
}
8385
return nil, err
8486
}
87+
endpoint, cleanup, err := s.propagateDockerEndpoint()
88+
if err != nil {
89+
return nil, err
90+
}
8591
return &modelAPI{
8692
path: dockerModel.Path,
8793
prepare: func(ctx context.Context, cmd *exec.Cmd) error {
8894
return s.prepareShellOut(ctx, project.Environment, cmd)
8995
},
90-
env: project.Environment.Values(),
96+
cleanup: cleanup,
97+
env: append(project.Environment.Values(), endpoint...),
9198
}, nil
9299
}
93100

101+
func (m *modelAPI) Close() {
102+
m.cleanup()
103+
}
104+
94105
func (m *modelAPI) PullModel(ctx context.Context, model types.ModelConfig, quietPull bool, w progress.Writer) error {
95106
w.Event(progress.Event{
96107
ID: model.Name,

pkg/compose/shellout.go

Lines changed: 42 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,16 @@ package compose
1818

1919
import (
2020
"context"
21+
"os"
2122
"os/exec"
23+
"path/filepath"
2224

2325
"github.com/compose-spec/compose-go/v2/types"
2426
"github.com/docker/cli/cli-plugins/metadata"
25-
"github.com/docker/cli/cli/context/docker"
27+
"github.com/docker/cli/cli/command"
28+
"github.com/docker/cli/cli/flags"
2629
"github.com/docker/compose/v2/internal"
30+
"github.com/docker/docker/client"
2731
"go.opentelemetry.io/otel"
2832
"go.opentelemetry.io/otel/propagation"
2933
)
@@ -39,23 +43,44 @@ func (s *composeService) prepareShellOut(gctx context.Context, env types.Mapping
3943
otel.GetTextMapPropagator().Inject(gctx, &carrier)
4044
env.Merge(types.Mapping(carrier))
4145

42-
env["DOCKER_CONTEXT"] = s.dockerCli.CurrentContext()
46+
cmd.Env = env.Values()
47+
return nil
48+
}
49+
50+
// propagateDockerEndpoint produces DOCKER_* env vars for a child CLI plugin to target the same docker endpoint
51+
// `cleanup` func MUST be called after child process completion to enforce removal of cert files
52+
func (s *composeService) propagateDockerEndpoint() ([]string, func(), error) {
53+
cleanup := func() {}
54+
env := types.Mapping{}
55+
env[command.EnvOverrideContext] = s.dockerCli.CurrentContext()
4356
env["USER_AGENT"] = "compose/" + internal.Version
57+
endpoint := s.dockerCli.DockerEndpoint()
58+
env[client.EnvOverrideHost] = endpoint.Host
59+
if endpoint.TLSData != nil {
60+
certs, err := os.MkdirTemp("", "compose")
61+
if err != nil {
62+
return nil, cleanup, err
63+
}
64+
cleanup = func() {
65+
_ = os.RemoveAll(certs)
66+
}
67+
env[client.EnvOverrideCertPath] = certs
68+
if !endpoint.SkipTLSVerify {
69+
env[client.EnvTLSVerify] = "1"
70+
}
4471

45-
md, err := s.dockerCli.ContextStore().GetMetadata(s.dockerCli.CurrentContext())
46-
if err != nil {
47-
return err
48-
}
49-
endpoint, err := docker.EndpointFromContext(md)
50-
if err != nil {
51-
return err
72+
err = os.WriteFile(filepath.Join(certs, flags.DefaultKeyFile), endpoint.TLSData.Key, 0o600)
73+
if err != nil {
74+
return nil, cleanup, err
75+
}
76+
err = os.WriteFile(filepath.Join(certs, flags.DefaultCaFile), endpoint.TLSData.Cert, 0o600)
77+
if err != nil {
78+
return nil, cleanup, err
79+
}
80+
err = os.WriteFile(filepath.Join(certs, flags.DefaultCaFile), endpoint.TLSData.CA, 0o600)
81+
if err != nil {
82+
return nil, cleanup, err
83+
}
5284
}
53-
actualHost := s.dockerCli.DockerEndpoint().Host
54-
if endpoint.Host != actualHost {
55-
// We are running with `--host` or `DOCKER_HOST` which overrides selected context
56-
env["DOCKER_HOST"] = actualHost
57-
}
58-
59-
cmd.Env = env.Values()
60-
return nil
85+
return env.Values(), cleanup, nil
6186
}

0 commit comments

Comments
 (0)