Skip to content

Commit bb7bb20

Browse files
authored
Merge pull request #6501 from jonasgeiler/feat/SecretsUsedInArgOrEnv-ignore-file-version
frontend: prevent `SecretsUsedInArgOrEnv` warning for `_FILE`/`_VERSION` ARG/ENV names
2 parents 69dd137 + 091d0c5 commit bb7bb20

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

frontend/dockerfile/dockerfile2llb/convert.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2616,6 +2616,8 @@ func getSecretsRegex() (*regexp.Regexp, *regexp.Regexp) {
26162616

26172617
allowTokens := []string{
26182618
"public",
2619+
"file",
2620+
"version",
26192621
}
26202622
allowPattern := `(?i)(?:_|^)(?:` + strings.Join(allowTokens, "|") + `)(?:_|$)`
26212623
secretsAllowRegexp = regexp.MustCompile(allowPattern)

frontend/dockerfile/dockerfile_lint_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,9 @@ ENV apikey=bar sunflower=foo
244244
ENV git_key=
245245
ENV PUBLIC_KEY=
246246
ARG public_token
247+
ARG SECRET_PASSPHRASE_FILE
248+
ENV password_file=bar secret_File=baz
249+
ARG AUTH_MODULE_VERSION
247250
# check=skip=SecretsUsedInArgOrEnv // allow secret in environment
248251
ENV password=bar
249252
# check=skip=SecretsUsedInArgOrEnv // allow secret in arg

0 commit comments

Comments
 (0)