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.

Sign up for GitHub

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

Jump to bottom

Make scope work with weave master. #574

Merged
merged 1 commit into from
Oct 20, 2015
Merged

Make scope work with weave master. #574

merged 1 commit into from
Oct 20, 2015

Conversation

tomwilkie
Copy link
Contributor

Fixes #560

  • Don't use the embedded weave script to drive dns or expose; run the appropriate weaveexec image instead
  • Deal with weave being in the host net namespace
  • Embedded weave script still needed to get container ips.

@tomwilkie tomwilkie self-assigned this Oct 20, 2015
@tomwilkie tomwilkie changed the title Make scope work with weave master. [WIP] Make scope work with weave master. Oct 20, 2015
@tomwilkie tomwilkie changed the title [WIP] Make scope work with weave master. Make scope work with weave master. Oct 20, 2015
@tomwilkie tomwilkie removed their assignment Oct 20, 2015
paulbellamy
paulbellamy reviewed Oct 20, 2015
View reviewed changes
docker/entrypoint.sh
"true ")
echo "$1 container has no IP address; is Docker networking enabled?" >&2
return 1
"true host")

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

This comment was marked as abuse.

Sign in to view

@paulbellamy
Copy link
Contributor

Question about the container_ip case, but other than that, LGTM.

tomwilkie added a commit that referenced this pull request Oct 20, 2015
@tomwilkie
Merge pull request #574 from weaveworks/560-work-with-1.2
4cc9a13 
Make scope work with weave master.
@tomwilkie tomwilkie merged commit 4cc9a13 into master Oct 20, 2015
@tomwilkie tomwilkie deleted the 560-work-with-1.2 branch October 20, 2015 11:27
@tomwilkie tomwilkie mentioned this pull request Oct 23, 2015
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@tomwilkie @paulbellamy