feature: add volumes-from for container #1131
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 #1131 +/- ##
==========================================
- Coverage 15.57% 15.33% -0.25%
==========================================
Files 172 173 +1
Lines 9727 9782 +55
==========================================
- Hits 1515 1500 -15
- Misses 8103 8174 +71
+ Partials 109 108 -1
|
allencloud
reviewed
Apr 16, 2018
| @@ -80,6 +80,7 @@ func addCommonFlags(flagSet *pflag.FlagSet) *container { | |||
| flagSet.StringVar(&c.utsMode, "uts", "", "UTS namespace to use") | |||
|
|
|||
| flagSet.StringSliceVarP(&c.volume, "volume", "v", nil, "Bind mount volumes to container, format is: [source:]<destination>[:mode], [source] can be volume or host's path, <destination> is container's path, [mode] can be \"ro/rw/dr/rr/z/Z/nocopy/private/rprivate/slave/rslave/shared/rshared\"") | |||
| flagSet.StringSliceVar(&c.volumesFrom, "volumes-from", nil, "set volumes from other containers, format is <container>[:mode]") | |||
There was a problem hiding this comment.
I think it is other container, since we cannot set volumes for multiple containers.
There was a problem hiding this comment.
I don't think so, the api VolumesFrom is a slice, it means it can use more than one container's volumes.
allencloud
reviewed
Apr 16, 2018
daemon/mgr/container.go
Outdated
| @@ -1592,6 +1634,21 @@ func checkBind(b string) ([]string, error) { | |||
| return arr, nil | |||
| } | |||
|
|
|||
| func parseVolumesFrom(volume string) (string, string, error) { | |||
There was a problem hiding this comment.
Please move this part into pkg opts.
|
Could we add some integration test for this PR. Thanks a lot. @rudyfly |
|
May I give some suggestions about integration tests, I would prefer tests like following: Positive test:
|
allencloud
reviewed
Apr 17, 2018
test/cli_run_test.go
Outdated
| for _, line := range strings.Split(out, "\n") { | ||
| if strings.Contains(line, "\"volumesfrom-test-volume\": \"/mnt\"") { | ||
| volumeFound = true | ||
| continue |
Add volumes-from for container, container can use the volumes of another containers. The format is "<containerID>[:mode]" Signed-off-by: Rudy Zhang <[email protected]>
|
LGTM |
pouchrobot
added
the
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.
Ⅰ. Describe what this PR did
Add volumes-from for container, container can use the volumes of another
containers. The format is
<containerID>[:mode]Ⅱ. Does this pull request fix one issue?
fixes #463
Ⅲ. Describe how you did it
Ⅳ. Describe how to verify it
Ⅴ. Special notes for reviews
Signed-off-by: Rudy Zhang [email protected]