Tag containers with Weave and Docker IPs #396
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
tomwilkie
force-pushed
the
weave-docker-ips
branch
3 times, most recently
from
1e6065c to
b86cbaa
Compare
| @@ -212,6 +213,7 @@ func (c *container) GetNodeMetadata() report.NodeMetadata { | |||
| ContainerCreated: c.container.Created.Format(time.RFC822), | |||
| ContainerCommand: c.container.Path + " " + strings.Join(c.container.Args, " "), | |||
| ImageID: c.container.Image, | |||
| ContainerIPs: c.container.NetworkSettings.IPAddress, | |||
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
tomwilkie
force-pushed
the
weave-docker-ips
branch
from
b86cbaa to
b04d608
Compare
|
@2opremio PTAL |
…o nodes in the container topology.
tomwilkie
force-pushed
the
weave-docker-ips
branch
from
b04d608 to
d8ac16d
Compare
| } | ||
|
|
||
| existingIPs := report.MakeIDList(strings.Fields(nmd.Metadata[docker.ContainerIPs])...) | ||
| existingIPs = existingIPs.Add(ips...) |
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
|
@2opremio PTAL |
|
LGTM |
tomwilkie
force-pushed
the
weave-docker-ips
branch
from
ca6d142 to
1ad1197
Compare
tomwilkie
added a commit
that referenced
this pull request
Aug 26, 2015
Tag containers with Weave and Docker IPs
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 #326
This change involved periodically invoking
weave ps, which requires the weave script to be installed in our container, which requires the Docker CLI to be installed in out container.