bugfix: fix exec record user as container config user #1657
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
HusterWan
reviewed
Jul 9, 2018
daemon/mgr/container_exec.go
Outdated
| @@ -61,29 +62,26 @@ func (mgr *ContainerManager) StartExec(ctx context.Context, execid string, confi | |||
| return err | |||
| } | |||
|
|
|||
| c.Lock() | |||
| uid, gid, err = user.Get(c.BaseFS, execConfig.User) | |||
HusterWan
reviewed
Jul 10, 2018
daemon/mgr/container_exec.go
Outdated
| @@ -61,29 +62,26 @@ func (mgr *ContainerManager) StartExec(ctx context.Context, execid string, confi | |||
| return err | |||
| } | |||
|
|
|||
| c.Lock() | |||
| uid, gid, err := user.Get(c.BaseFS, execConfig.User) | |||
There was a problem hiding this comment.
@Ace-Tang can we add some test cases to lock this issue?
|
ci failed, @Ace-Tang PTAC |
Ace-Tang
commented
Jul 10, 2018
| if execConfig.User == "" { | ||
| execConfig.User = c.Config.User | ||
| } | ||
|
|
There was a problem hiding this comment.
we should use container origin user if exec user is null
|
@YaoZengzeng and @starnop please help to check CI. Thanks |
|
LGTM |
1 similar comment
|
LGTM |
|
cri-tools validation fails, see https://travis-ci.org/alibaba/pouch/jobs/402115580 |
|
@allencloud ， cri test has passed. |
|
Next step, I will combine |
Codecov Report
@@ Coverage Diff @@
## master #1657 +/- ##
===========================================
+ Coverage 17.86% 41.18% +23.31%
===========================================
Files 229 274 +45
Lines 15638 18091 +2453
===========================================
+ Hits 2794 7450 +4656
+ Misses 12650 9729 -2921
- Partials 194 912 +718
|
|
Since after the two LGTMs, the code has changed again. I would like to invite @fuweid to take another review. Thanks. |
fuweid
reviewed
Jul 10, 2018
test/cli_exec_test.go
Outdated
| res = command.PouchRun("exec", name, "id", "-u") | ||
| res.Assert(c, icmd.Success) | ||
| if !strings.Contains(res.Stdout(), "1001") { | ||
| c.Fatalf("failed to run a container with user: %s", |
There was a problem hiding this comment.
Please update the comment with expected user name. It can show right message if there is any error
1. pouch exec -u user $container will record user as container config, fix exec set user. 2. fix namespace hardcode in setBaseFS Signed-off-by: Ace-Tang <aceapril@126.com>
|
LGTM |
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.
pouch exec -u user $container will record user as container
config, fix exec set user.
Signed-off-by: Ace-Tang aceapril@126.com
Ⅰ. Describe what this PR did
without this patch, will get error like:
Ⅱ. Does this pull request fix one issue?
Ⅲ. Describe how you did it
Ⅳ. Describe how to verify it
Ⅴ. Special notes for reviews