docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-05-23 04:07:45 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #488 from crazy-max/secrets-env

Browse Source 
Allow secrets with env
This commit is contained in:
Tõnis Tiigi 2021-01-04 10:40:09 -08:00 committed by GitHub
commit ea5d32ddff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/secrets.go
View File

@ -34,6 +34,7 @@ func parseSecret(value string) (*secretsprovider.Source, error) {
fs := secretsprovider.Source{} fs := secretsprovider.Source{}
var typ string
for _, field := range fields { for _, field := range fields {
parts := strings.SplitN(field, "=", 2) parts := strings.SplitN(field, "=", 2)
key := strings.ToLower(parts[0]) key := strings.ToLower(parts[0])
@ -45,16 +46,23 @@ func parseSecret(value string) (*secretsprovider.Source, error) {
value := parts[1] value := parts[1]
switch key { switch key {
case "type": case "type":
if value != "file" { if value != "file" && value != "env" {
return nil, errors.Errorf("unsupported secret type %q", value) return nil, errors.Errorf("unsupported secret type %q", value)
} }
typ = value
case "id": case "id":
fs.ID = value fs.ID = value
case "source", "src": case "source", "src":
fs.FilePath = value fs.FilePath = value
case "env":
fs.Env = value
default: default:
return nil, errors.Errorf("unexpected key '%s' in '%s'", key, field) return nil, errors.Errorf("unexpected key '%s' in '%s'", key, field)
} }
} }
if typ == "env" && fs.Env == "" {
fs.Env = fs.FilePath
fs.FilePath = ""
}
return &fs, nil return &fs, nil
} }