From c5076f81b1900e258d227c990b5d2b5145b56bed Mon Sep 17 00:00:00 2001 From: Evan Hazlett Date: Fri, 16 Jan 2015 17:18:30 -0500 Subject: [PATCH] fixes #289: path issue for windows machine clients Signed-off-by: Evan Hazlett --- host.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/host.go b/host.go index e9df18ec4f..f0d882b8cd 100644 --- a/host.go +++ b/host.go @@ -177,19 +177,22 @@ func (h *Host) ConfigureAuth() error { if err != nil { return err } - machineCaCertPath := filepath.Join(d.GetDockerConfigDir(), "ca.pem") + + // due to windows clients, we cannot use filepath.Join as the paths + // will be mucked on the linux hosts + machineCaCertPath := fmt.Sprintf("%s/ca.pem", d.GetDockerConfigDir()) serverCert, err := ioutil.ReadFile(serverCertPath) if err != nil { return err } - machineServerCertPath := filepath.Join(d.GetDockerConfigDir(), "server.pem") + machineServerCertPath := fmt.Sprintf("%s/server.pem", d.GetDockerConfigDir()) serverKey, err := ioutil.ReadFile(serverKeyPath) if err != nil { return err } - machineServerKeyPath := filepath.Join(d.GetDockerConfigDir(), "server-key.pem") + machineServerKeyPath := fmt.Sprintf("%s/server-key.pem", d.GetDockerConfigDir()) cmd, err = d.GetSSHCommand(fmt.Sprintf("echo \"%s\" | sudo tee -a %s", string(caCert), machineCaCertPath)) if err != nil {