This repository was archived by the owner on Jun 20, 2024. It is now read-only.
Only pass $DOCKER_HOST if it is a Unix socket #1822
Merged
Conversation
This file contains hidden or 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
|
Works with Docker Machine on OS X. |
...and the address was the correct one when on the remote machine, right? |
| } | ||
|
|
||
| exec_remote() { | ||
| # Pass through DOCKER_HOST if it is a Unix socket; | ||
| # a TCP socket may be secured by TLS, in which case we can't use it | ||
| if echo "$DOCKER_HOST" | grep -q "^unix://" ; 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.
Indeed. |
b6e3d24 to
da556b8
Compare
|
Updated per review comments |
|
Needs removal of a few more |
a TCP socket may be secured by TLS, in which case we can't use it.
- since we won't now be copying $DOCKER_HOST This reverts commit d8cfbc4.
da556b8 to
bab758e
Compare
|
Oops, fixed |
bboreham
added a commit
that referenced
this pull request
Dec 22, 2015
Only pass $DOCKER_HOST if it is a Unix socket - fixes #1820
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 #1820, at the cost of some flexibility: if
$DOCKER_HOSTis set totcp:xxx, then the remote Docker must also be listening on the standard/var/run/docker.sock.Previously it would work if
$DOCKER_HOSTpointed at a non-TLS TCP socket. But those are discouraged.