docker
/
buildx
mirror of https://github.com/docker/buildx.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: fix env vars check for vcs details 

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
This commit is contained in:
CrazyMax 2022-12-14 09:45:13 +01:00
parent e21f56e801
commit cf8fa4a404
No known key found for this signature in database
GPG Key ID: 3248E46B6BB8C7F7
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/git.go
View File

@ -24,13 +24,13 @@ func getGitAttributes(ctx context.Context, contextPath string, dockerfilePath st
if v, ok := os.LookupEnv("BUILDX_GIT_LABELS"); ok { if v, ok := os.LookupEnv("BUILDX_GIT_LABELS"); ok {
if v == "full" { // backward compatibility with old "full" mode if v == "full" { // backward compatibility with old "full" mode
setGitLabels = true setGitLabels = true
} else if v, _ := strconv.ParseBool(v); v { } else if v, err := strconv.ParseBool(v); err == nil {
setGitLabels = v setGitLabels = v
} }
} }
setGitInfo := true setGitInfo := true
if v, ok := os.LookupEnv("BUILDX_GIT_INFO"); ok { if v, ok := os.LookupEnv("BUILDX_GIT_INFO"); ok {
if v, _ := strconv.ParseBool(v); v { if v, err := strconv.ParseBool(v); err == nil {
setGitInfo = v setGitInfo = v
} }
} }

6
build/git_test.go
View File

@ -43,6 +43,12 @@ func TestGetGitAttributes(t *testing.T) {
"vcs:revision", "vcs:revision",
}, },
}, },
{
name: "none",
envGitLabels: "false",
envGitInfo: "false",
expected: []string{},
},
{ {
name: "gitinfo", name: "gitinfo",
envGitLabels: "false", envGitLabels: "false",