Merge pull request #1468 from crazy-max/fix-git-vcs-check

build: fix env vars check for vcs details
This commit is contained in:
Justin Chadwell 2022-12-14 12:51:29 +00:00 committed by GitHub
commit b741d26eb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions

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 == "full" { // backward compatibility with old "full" mode
setGitLabels = true
} else if v, _ := strconv.ParseBool(v); v {
} else if v, err := strconv.ParseBool(v); err == nil {
setGitLabels = v
}
}
setGitInfo := true
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
}
}

View File

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