Merge image metadata into container metadata so image labels can be used to hide containers. #705
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
changed the title
| @@ -110,7 +110,7 @@ case "$COMMAND" in | |||
| echo $CONTAINER | |||
|
|
|||
| if ! echo "$@" | grep -E "\-\-no\-app|\-\-service\-token" 1>/dev/null; then | |||
| IP_ADDRS=$(docker run --rm --net=host --entrypoint /bin/sh $SCOPE_IMAGE -c "$IP_ADDR_CMD") | |||
| IP_ADDRS=$(docker run --rm --net=host --label=works.weave.role=system --entrypoint /bin/sh $SCOPE_IMAGE -c "$IP_ADDR_CMD") | |||
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.
|
Other than the above, LGTM. |
…sed to hid containers.
tomwilkie
force-pushed
the
664-use-labels-to-hide
branch
from
9b95c99 to
88116ca
Compare
tomwilkie
added a commit
that referenced
this pull request
Dec 4, 2015
Merge image metadata into container metadata so image labels can be used to hide containers.
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 #664