Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bugfix: distinguish cmd and entrypoint better #1045

Merged
merged 1 commit into from
Apr 4, 2018

Conversation

YaoZengzeng
Copy link
Contributor

@YaoZengzeng YaoZengzeng commented Apr 3, 2018

Signed-off-by: YaoZengzeng [email protected]

Ⅰ. Describe what this PR did

Ⅱ. Does this pull request fix one issue?

Ⅲ. Describe how you did it

In order to be consistent with Docker:

  1. User has specified container's entrypoint, don't use the cmd of image's configuration to fill it , even if it is empty.

  2. User has not specified container's entrypoing, use the entrypoint of image's configuration to fill it, as well as cmd.

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

@pouchrobot pouchrobot added kind/bug This is bug report for project size/S labels Apr 3, 2018
@codecov-io
Copy link

Codecov Report

Merging #1045 into master will decrease coverage by <.01%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1045      +/-   ##
==========================================
- Coverage   15.68%   15.68%   -0.01%     
==========================================
  Files         139      139              
  Lines        8499     8500       +1     
==========================================
  Hits         1333     1333              
- Misses       7066     7067       +1     
  Partials      100      100
Impacted Files Coverage Δ
daemon/mgr/container_types.go 15.38% <0%> (ø) ⬆️
daemon/mgr/cri.go 0% <0%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3860821...861cc1d. Read the comment docs.

@YaoZengzeng
Copy link
Contributor Author

@allencloud PTAL

With this PR being merged, the node-e2e-test result of k8s + pouch will be:

Ran 186 of 258 Specs in 1673.546 seconds
FAIL! -- 181 Passed | 5 Failed | 0 Pending | 72 Skipped

@HusterWan
Copy link
Contributor

LGTM

@HusterWan HusterWan merged commit 55fbc1a into AliyunContainerService:master Apr 4, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug This is bug report for project size/S
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants