Move bulk of scope script logic into entrypoint.sh, extend testing #524
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
testing
branch
2 times, most recently
from
453db41 to
4af13ad
Compare
| @@ -15,4 +15,7 @@ echo Installing weave | |||
| for HOST in $HOSTS; do | |||
| run_on $HOST "sudo curl -sL git.io/weave -o /usr/local/bin/weave" | |||
| run_on $HOST "sudo chmod a+x /usr/local/bin/weave" | |||
| weave_on $HOST setup | |||
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
tomwilkie
changed the title
tomwilkie
changed the title
tomwilkie
force-pushed
the
testing
branch
4 times, most recently
from
aee5a03 to
441b014
Compare
added 4 commits
September 30, 2015 11:54
Also - Add test for clustering without weave. - Update test template for docker 1.8 - Prefetch images - Stop all containers when test finishes. - Add small sleep after weave launch, and supply all the hosts to ensure IPAM works correctly.
|
Why not move most of the logic straight into the go code? instead of the bash? Just expediency? |
| WEAVEDNS_CONTAINER_NAME=weavedns | ||
| HOSTNAME=scope | ||
| DOMAINNAME=weave.local | ||
| FQDN=$HOSTNAME.$DOMAINNAME | ||
| DOCKER_BRIDGE=${DOCKER_BRIDGE:-docker0} |
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
Yeah we should do that at some point; that would help with #510. But thats a bigger change, and this gets us some of the way there for now. |
| @@ -73,15 +107,34 @@ while true; do | |||
| shift | |||
| done | |||
|
|
|||
| echo "$APP_ARGS" >/etc/weave/scope-app.args | |||
| echo "$PROBE_ARGS" >/etc/weave/scope-probe.args | |||
| if is_running $WEAVE_CONTAINER_NAME; then | |||
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.
paulbellamy
added a commit
that referenced
this pull request
Sep 30, 2015
Move bulk of scope script logic into entrypoint.sh, extend testing
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 #523 by moving the detection and communication with Weave into the Scope container (and out of the scope script).
Will also help towards #329.
Also