Changed docker-machine and sshutil to support hostnames with colons i… #625
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
jimmidyson
suggested changes
Sep 23, 2016
| @@ -52,7 +52,7 @@ func NewSSHClient(d drivers.Driver) (*ssh.Client, error) { | |||
| return nil, errors.Wrapf(err, "Error creating new native config from ssh using: %s, %s", h.Username, auth) | |||
| } | |||
|
|
|||
| client, err := ssh.Dial("tcp", fmt.Sprintf("%s:%d", h.IP, h.Port), &config) | |||
| client, err := ssh.Dial("tcp", fmt.Sprintf("[%s]:%d", h.IP, h.Port), &config) | |||
There was a problem hiding this comment.
I think you're better off using net.JoinHostPort here.
| @@ -166,7 +166,7 @@ func (client *NativeClient) session(command string) (*ssh.Session, error) { | |||
| return nil, fmt.Errorf("Error attempting SSH client dial: %s", err) | |||
| } | |||
|
|
|||
| conn, err := ssh.Dial("tcp", fmt.Sprintf("%s:%d", client.Hostname, client.Port), &client.Config) | |||
| conn, err := ssh.Dial("tcp", fmt.Sprintf("[%s]:%d", client.Hostname, client.Port), &client.Config) | |||
| @@ -250,7 +250,7 @@ func (client *NativeClient) Shell(args ...string) error { | |||
| var ( | |||
| termWidth, termHeight int | |||
| ) | |||
| conn, err := ssh.Dial("tcp", fmt.Sprintf("%s:%d", client.Hostname, client.Port), &client.Config) | |||
| conn, err := ssh.Dial("tcp", fmt.Sprintf("[%s]:%d", client.Hostname, client.Port), &client.Config) | |||
…n them, for example ipv6 addresses
aaron-prindle
force-pushed
the
fix-ipv6-windows
branch
from
1a6519b
to
378e88b
Compare
|
Now using |
Current coverage is 32.95% (diff: 100%)@@ master #625 diff @@
==========================================
Files 44 44
Lines 1933 1933
Methods 0 0
Messages 0 0
Branches 0 0
==========================================
Hits 637 637
Misses 1168 1168
Partials 128 128
|
jimmidyson
approved these changes
Sep 23, 2016
dlorenc
approved these changes
Sep 23, 2016
dlorenc
reviewed
Sep 23, 2016
|
PR to docker machine is here: |
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.
…n them, for example ipv6 addresses