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

[v0.19] bake: remove empty values set by --set

Browse Source 
These parser functions are called for `--set` to
resolve entitlement paths that would be automatically added
and will fail for empty value.

The empty values would already be ignored but in v0.19 is
done after merging the `--set` values and then calling
parse again.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi 2024-12-15 23:15:16 -08:00
parent 85acd30ed7
commit 9a9dd4e87e
No known key found for this signature in database
GPG Key ID: AFA9DE5F8AB7AF39
4 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
util/buildflags/cache.go
View File

@ -14,6 +14,9 @@ import (
func ParseCacheEntry(in []string) ([]*controllerapi.CacheOptionsEntry, error) { func ParseCacheEntry(in []string) ([]*controllerapi.CacheOptionsEntry, error) {
outs := make([]*controllerapi.CacheOptionsEntry, 0, len(in)) outs := make([]*controllerapi.CacheOptionsEntry, 0, len(in))
for _, in := range in { for _, in := range in {
if in == "" {
continue
}
fields, err := csvvalue.Fields(in, nil) fields, err := csvvalue.Fields(in, nil)
if err != nil { if err != nil {
return nil, err return nil, err

3
util/buildflags/export.go
View File

@ -19,6 +19,9 @@ func ParseExports(inp []string) ([]*controllerapi.ExportEntry, error) {
return nil, nil return nil, nil
} }
for _, s := range inp { for _, s := range inp {
if s == "" {
continue
}
fields, err := csvvalue.Fields(s, nil) fields, err := csvvalue.Fields(s, nil)
if err != nil { if err != nil {
return nil, err return nil, err

3
util/buildflags/secrets.go
View File

@ -11,6 +11,9 @@ import (
func ParseSecretSpecs(sl []string) ([]*controllerapi.Secret, error) { func ParseSecretSpecs(sl []string) ([]*controllerapi.Secret, error) {
fs := make([]*controllerapi.Secret, 0, len(sl)) fs := make([]*controllerapi.Secret, 0, len(sl))
for _, v := range sl { for _, v := range sl {
if v == "" {
continue
}
s, err := parseSecret(v) s, err := parseSecret(v)
if err != nil { if err != nil {
return nil, err return nil, err

3
util/buildflags/ssh.go
View File

@ -14,6 +14,9 @@ func ParseSSHSpecs(sl []string) ([]*controllerapi.SSH, error) {
} }
for _, s := range sl { for _, s := range sl {
if s == "" {
continue
}
parts := strings.SplitN(s, "=", 2) parts := strings.SplitN(s, "=", 2)
out := controllerapi.SSH{ out := controllerapi.SSH{
ID: parts[0], ID: parts[0],