dockerfile: don't allow non-Dockerfile syntax for directives #5646
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
crazy-max
reviewed
Jan 13, 2025
There was a problem hiding this comment.
lint issue: https://github.com/moby/buildkit/actions/runs/12719620183/job/35460112008?pr=5646#step:4:484
> [linux/amd64->freebsd/amd64 golangci-lint 1/1] RUN --mount=target=/go/src/github.com/moby/buildkit --mount=target=/root/.cache,type=cache,id=lint-cache-default-freebsd/amd64 xx-go --wrap && golangci-lint run --build-tags "" && touch /golangci-lint.done:
746.9 frontend/dockerfile/parser/directives_test.go:147:2: ineffectual assignment to ref (ineffassign)
746.9 ref, _, _, ok = ParseDirective("check", []byte(dt))
746.9 ^
ParseDirectives code was changed when "check" directive was added and copied over logic from DetectSyntax function. This does not look correct as the only allowed formatting for Dockerfile directives is with a Dockerfile comment. "#syntax" is a special case because we want to allow frontend forwarding capability also in non-Dockerfile sources that use different style of comments or using config files with JSON as frontend entrypoints. Signed-off-by: Tonis Tiigi <[email protected]>
tonistiigi
force-pushed
the
directive-parse-format-fix
branch
from
525856e to
a3adbd6
Compare
crazy-max
approved these changes
Jan 14, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
regression from #4962
ParseDirectives code was changed when "check" directive was added and copied over logic from DetectSyntax function. This does not look correct as the only allowed formatting for Dockerfile directives is with a Dockerfile comment. "#syntax" is a special case because we want to allow frontend forwarding capability also in non-Dockerfile sources that use different style of comments or using config files with JSON as frontend entrypoints.