bugfix: missing merge some config from image #2156
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
Codecov Report
@@ Coverage Diff @@
## master #2156 +/- ##
==========================================
+ Coverage 64.41% 64.45% +0.03%
==========================================
Files 209 209
Lines 16669 16693 +24
==========================================
+ Hits 10738 10760 +22
- Misses 4603 4604 +1
- Partials 1328 1329 +1
|
fuweid
suggested changes
Aug 24, 2018
daemon/mgr/container_types.go
Outdated
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| // If user specify the Entrypoint, no need to merge image's configuration. | ||
| // Otherwise use the image's configuration to fill it. | ||
| // If user specify the Entrypoint, no need to merge image's confuration. |
| c.Config.WorkingDir = config.WorkingDir | ||
| c.Config.WorkingDir = imageConf.WorkingDir | ||
| } | ||
|
|
Ace-Tang
commented
Aug 25, 2018
| }); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
There was a problem hiding this comment.
put merge funtion before initContainerStorage, make mount points generate completely.
fuweid
reviewed
Aug 25, 2018
| @@ -355,6 +355,18 @@ func (mgr *ContainerManager) Create(ctx context.Context, name string, config *ty | |||
| HostConfig: config.HostConfig, | |||
| } | |||
|
|
|||
| // merge image's config into container | |||
| if err := container.merge(func() (ocispec.ImageConfig, error) { | |||
| img, err := mgr.Client.GetImage(ctx, config.Image) | |||
There was a problem hiding this comment.
This should ask the one wrote for it, seems like a bug.
daemon/mgr/container_types_test.go
Outdated
| assert.NoError(err) | ||
|
|
||
| // sort slice | ||
|
|
1. add user, labels, stop signal and exposed ports config from image config in create container. 2. put merge funtion before initContainerStorage, make mount points generate completely. 3. fix not return error in merge funtion. Signed-off-by: Ace-Tang <aceapril@126.com>
|
ping @YaoZengzeng and @starnop could you help us to check this failure case? https://travis-ci.org/alibaba/pouch/jobs/420765951 thanks |
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.
add user, labels, stop signal and exposed ports config from image
config in create container.
Signed-off-by: Ace-Tang aceapril@126.com
Ⅰ. Describe what this PR did
Ⅱ. Does this pull request fix one issue?
Ⅲ. Why don't you add test cases (unit test/integration test)? (你真的觉得不需要加测试吗？)
Ⅳ. Describe how to verify it
Ⅴ. Special notes for reviews