docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-05-18 09:17:49 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

bake: support compose secrets env

Browse Source 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
This commit is contained in:
CrazyMax 2022-06-14 18:45:23 +02:00
parent 50c23aa755
commit e0350f671a
No known key found for this signature in database
GPG Key ID: 3248E46B6BB8C7F7
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bake/compose.go
View File

@ -235,6 +235,9 @@ func composeToBuildkitSecret(inp compose.ServiceSecretConfig, psecret compose.Se
if psecret.File != "" { if psecret.File != "" {
bkattrs = append(bkattrs, "src="+psecret.File) bkattrs = append(bkattrs, "src="+psecret.File)
} }
if psecret.Environment != "" {
bkattrs = append(bkattrs, "env="+psecret.Environment)
}
return strings.Join(bkattrs, ","), nil return strings.Join(bkattrs, ","), nil
} }

7
bake/compose_test.go
View File

@ -24,10 +24,11 @@ services:
args: args:
buildno: 123 buildno: 123
secrets: secrets:
- ENV_TOKEN - token
- aws - aws
secrets: secrets:
ENV_TOKEN: {} token:
environment: ENV_TOKEN
aws: aws:
file: /root/.aws/credentials file: /root/.aws/credentials
`) `)
@ -54,7 +55,7 @@ secrets:
require.Equal(t, "123", c.Targets[1].Args["buildno"]) require.Equal(t, "123", c.Targets[1].Args["buildno"])
require.Equal(t, "none", *c.Targets[1].NetworkMode) require.Equal(t, "none", *c.Targets[1].NetworkMode)
require.Equal(t, []string{ require.Equal(t, []string{
"id=ENV_TOKEN", "id=token,env=ENV_TOKEN",
"id=aws,src=/root/.aws/credentials", "id=aws,src=/root/.aws/credentials",
}, c.Targets[1].Secrets) }, c.Targets[1].Secrets)
} }