Honor DOCKER_* env variables in probe and app #2649
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
2opremio
reviewed
Jun 27, 2017
prog/probe.go
Outdated
| @@ -236,7 +234,7 @@ func probeMain(flags probeFlags, targets []appclient.Target) { | |||
|
|
|||
| if flags.weaveEnabled { | |||
| client := weave.NewClient(sanitize.URL("http://", 6784, "")(flags.weaveAddr)) | |||
| weave, err := overlay.NewWeave(hostID, client, dockerEndpoint) | |||
| weave, err := overlay.NewWeave(hostID, client, "") | |||
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
reviewed
Jun 27, 2017
| @@ -394,7 +394,7 @@ func main() { | |||
| if flags.probe.httpListen != "" { | |||
| _, _, err := net.SplitHostPort(flags.probe.httpListen) | |||
| if err != nil { | |||
| log.Fatalf("Invalid value for -app.http.address: %v", err) | |||
| log.Fatalf("Invalid value for -probe.http.address: %v", err) | |||
This comment was marked as abuse.
This comment was marked as abuse.
Sorry, something went wrong.
Changed default for flag `-app.docker` to use the DOCKER_* env variables instead of hardcoded /var/run/docker.sock; uses docker's default if no DOCKER_HOST defined, for both probe and app. Fixes #1975
rndstr
force-pushed
the
1975-honor-docker-host-in-probe
branch
from
927bb25 to
651e52b
Compare
2opremio
approved these changes
Jun 27, 2017
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.
Changed default for flag
-app.dockerto use the DOCKER_* env variablesinstead of hardcoded /var/run/docker.sock; uses docker's default if
no DOCKER_HOST defined, for both probe and app.
Fixes #1975
This is technically a breaking change (if someone had DOCKER_HOST set before and not provided an alternate location in
-app.docker, it will now take a different location); albeit one I would assume impact is very low. Still, how do we handle this?