Adjust argument slice size in builder #164
Merged
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
openshift-ci-robot
added
the
approved
nalind
reviewed
Jun 2, 2020
| @@ -332,7 +332,7 @@ func ParseFile(path string) (*parser.Node, error) { | |||
|
|
|||
| // Step creates a new step from the current state. | |||
| func (b *Builder) Step() *Step { | |||
| dst := make([]string, len(b.Env)+len(b.RunConfig.Env)) | |||
| dst := make([]string, len(b.Env)+len(b.RunConfig.Env)+len(b.Arguments())) | |||
| copy(dst, makeUserArgs(b)) | |||
| dst = append(dst, b.RunConfig.Env...) | |||
There was a problem hiding this comment.
Some of the values from b.Args won't be used if they conflict with environment values, so the size count being used here for allocating dst can be off, and if it is, it can leave a gap with empty strings in the final slice.
A recent update to the argument handling didn't increase the argument slice to take into the account the values from b.Args() that were now being added. The created unpredicatble results. After addressing a comment from @nalind, I realized that the value from b.Arguments should be used in the steps as it keeps the ordering of when the ARGS and ENV were defined in the Dockerfile. Changed makeUserArgs in internals.go to take two variables rather than just a builder. Adddresses the Buildah bug: containers/buildah#2345 Signed-off-by: TomSweeneyRedHat <[email protected]>
TomSweeneyRedHat
force-pushed
the
dev/tsweeney/fixslicesize
branch
from
68ded6b to
3ccf1b9
Compare
|
LGTM |
|
@nalind PTAL |
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: nalind, TomSweeneyRedHat The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
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.
A recent update to the argument handling didn't increase
the argument slice size to take into account the values
from b.Args() that were now being added. This created
unpredictable results.
After addressing a comment from @nalind, I realized that
the value from b.Arguments should be used in the steps
as it keeps the ordering of when the ARGS and ENV were
defined in the Dockerfile. Changed makeUserArgs
in internals.go to take two variables rather than just
a builder.
Addresses the Buildah bug: containers/buildah#2345
Signed-off-by: TomSweeneyRedHat [email protected]