Skip to content

pass bake secrets by env #13249

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Sep 30, 2025
+10 −24
Merged

pass bake secrets by env #13249

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 10 additions & 24 deletions pkg/compose/build_bake.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,18 +176,7 @@ func (s *composeService) doBuildBake(ctx context.Context, project *types.Project
}
}

// tmpSecrets stores secret set by environment variables, so we don't have to "pollute" bake process's environment
tmpSecrets, err := os.MkdirTemp("", "secrets")
if err != nil {
return nil, err
}
defer func() {
rerr := os.RemoveAll(tmpSecrets)
if rerr != nil {
logrus.Warnf("Failed to removed temporary secrets directory %s: %s", tmpSecrets, rerr.Error())
}
}()

var secretsEnv []string
for serviceName, service := range project.Services {
if service.Build == nil {
continue
Expand Down Expand Up @@ -244,10 +233,9 @@ func (s *composeService) doBuildBake(ctx context.Context, project *types.Project

target := targets[serviceName]

secrets, err := toBakeSecrets(project, build.Secrets, tmpSecrets)
if err != nil {
return nil, err
}
secrets, env := toBakeSecrets(project, build.Secrets)
secretsEnv = append(secretsEnv, env...)

cfg.Targets[target] = bakeTarget{
Context: build.Context,
Contexts: additionalContexts(build.AdditionalContexts, targets),
Expand Down Expand Up @@ -357,6 +345,7 @@ func (s *composeService) doBuildBake(ctx context.Context, project *types.Project
return nil, err
}
cmd.Env = append(cmd.Env, endpoint...)
cmd.Env = append(cmd.Env, secretsEnv...)
defer cleanup()

cmd.Stdout = s.stdout()
Expand Down Expand Up @@ -471,8 +460,9 @@ func toBakeSSH(ssh types.SSHConfig) []string {
return s
}

func toBakeSecrets(project *types.Project, secrets []types.ServiceSecretConfig, tmpSecrets string) ([]string, error) {
func toBakeSecrets(project *types.Project, secrets []types.ServiceSecretConfig) ([]string, []string) {
var s []string
var env []string
for _, ref := range secrets {
def := project.Secrets[ref.Source]
target := ref.Target
Expand All @@ -481,17 +471,13 @@ func toBakeSecrets(project *types.Project, secrets []types.ServiceSecretConfig,
}
switch {
case def.Environment != "":
sf := filepath.Join(tmpSecrets, def.Environment)
err := os.WriteFile(sf, []byte(project.Environment[def.Environment]), 0o600)
if err != nil {
return nil, err
}
s = append(s, fmt.Sprintf("id=%s,type=file,src=%s", target, sf))
env = append(env, fmt.Sprintf("%s=%s", def.Environment, project.Environment[def.Environment]))
s = append(s, fmt.Sprintf("id=%s,type=env,env=%s", target, def.Environment))
case def.File != "":
s = append(s, fmt.Sprintf("id=%s,type=file,src=%s", target, def.File))
}
}
return s, nil
return s, env
}

func toBakeAttest(build types.BuildConfig) []string {
Expand Down