builder: fix layer lifecycle leak #36338
Merged
+181
−131
Conversation
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
tonistiigi
force-pushed
the
fix-copy-leak
branch
from
bbe2a10 to
61e8ac4
Compare
Codecov Report
@@ Coverage Diff @@
## master #36338 +/- ##
=========================================
Coverage ? 34.06%
=========================================
Files ? 609
Lines ? 46261
Branches ? 0
=========================================
Hits ? 15758
Misses ? 28472
Partials ? 2031 |
dnephin
approved these changes
Feb 20, 2018
builder/dockerfile/internals.go
Outdated
| @@ -114,8 +115,8 @@ func (b *Builder) commitContainer(dispatchState *dispatchState, id string, conta | |||
| return err | |||
| } | |||
|
|
|||
| func (b *Builder) exportImage(state *dispatchState, imageMount *imageMount, runConfig *container.Config) error { | |||
| newLayer, err := imageMount.Layer().Commit() | |||
| func (b *Builder) exportImage(state *dispatchState, layer builder.RWLayer, parent *imageMount, runConfig *container.Config) error { | |||
There was a problem hiding this comment.
only parent.Image() is used, so maybe accept parent *image.Image instead of imageMount?
There was a problem hiding this comment.
replaced with builder.Image
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
tonistiigi
force-pushed
the
fix-copy-leak
branch
from
61e8ac4 to
7ad41d5
Compare
dnephin
approved these changes
Feb 20, 2018
|
Looks like this introduced a regression; #37077 (comment) |
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.
fixes docker/for-linux#135
fixes #35641
Signed-off-by: Tonis Tiigi tonistiigi@gmail.com