Ensure that ONBUILD triggers aren't committed to grandchildren#6451
Merged
unclejack merged 2 commits intomoby:masterfrom Jun 19, 2014
Merged
Conversation
Contributor
|
@cyphar would be great to add a test case for this one :) |
Contributor
|
@cyphar please add a cli integration test. |
Contributor
Author
|
There. Added an /ping @tiborvass @unclejack |
Contributor
There was a problem hiding this comment.
This test should be called TestBuildOnBuildUnwantedInheritance or something along those lines. There's a conflict with another test which uses this name right now.
The test should also have a comment above it with the issue it fixes and what it's doing.
e.g.:
// #6445 ensure ONBUILD triggers aren't committed to grand children
This patch fixes the bug where ONBUILD triggers are committed each build step created during the ONBUILD trigger execution, since the triggers are only wiped *after* all ONBUILD trigger steps have been committed. This was fixed by simply copying the ONBUILD triggers and wiping the config *before* committing anything. Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <[email protected]> (github: cyphar)
This patch adds CLI integration tests to ensure that NOCACHE instructions in Dockerfiles only apply to direct children of the original image. Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <[email protected]> (github: cyphar)
Contributor
|
LGTM |
1 similar comment
Contributor
|
LGTM |
unclejack
added a commit
that referenced
this pull request
Jun 19, 2014
…dchildren Ensure that ONBUILD triggers aren't committed to grandchildren
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
3 participants
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.
This patch fixes the bug where ONBUILD triggers are committed each build
step created during the ONBUILD trigger execution, since the triggers are
only wiped after all ONBUILD trigger steps have been committed. This was
fixed by simply copying the ONBUILD triggers and wiping the config
before committing anything.
Fixes #6445.
Docker-DCO-1.1-Signed-off-by: Aleksa Sarai [email protected] (github: cyphar)
/cc @shykes