Conversation
…ad of duplicating them Signed-off-by: Londopy <Londopy@users.noreply.github.com>
This file contains hidden or 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
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.
pkg/docker/dockerfile/dockerfile.goandpkg/docker/dockerfile/reverse/reverse.goeach carried their own uppercase copies of the Dockerfile instruction names (instTypeCmd = "CMD",instPrefixCmd = "CMD ", ...) alongside the canonical lowercase set inpkg/docker/instruction.This replaces both
constblocks withvarblocks that derive the uppercase form frominstruction.*(strings.ToUpper(instruction.Cmd)), so there's one set of names to maintain and the two files can't drift from it. The lowercase constants stay canonical because the AST parser,parser, and linter checks all key on them; the uppercase form is still needed here for image-history matching and Dockerfile output (InstructionInfo.Typeis serialized uppercase, so no output change).The local identifiers are kept, so none of the ~25 usage sites change.
dockerfile.goonly ever used theUSER/EXPOSE/WORKDIRprefixes, so the other 17 unused names there are just dropped.Verified with
GOOS=linux go build ./pkg/docker/...,go vet, and thereversepackage tests (run on Linux).Not touched, in case you want them as a follow-up: the inline
fmt.Sprintf("RUN %s", ...)/"EXPOSE %s"/WriteString("ENV ")literals in the same two files.Closes #74