centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-03 01:38:58 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #487 from ehazlett/fix-config-no-machine

Browse Source 
fixes error when running config against no active host
This commit is contained in:
Evan Hazlett
2015-02-04 11:30:54 -05:00
parent b55ec6ec5c 7ce53190cf
commit 3a2f547409
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
commands.go
View File

@@ -540,15 +540,21 @@ func getMachineConfig(c *cli.Context) (*machineConfig, error) {
if err != nil {
log.Fatalf("error getting active host: %v", err)
}
if m == nil {
return nil, fmt.Errorf("There is no active host")
}
machine = m
} else {
m, err := store.Load(name)
fmt.Println(err)
if err != nil {
return nil, fmt.Errorf("Error loading machine config: %s", err)
}
machine = m
}
fmt.Println(machine)
caCert := filepath.Join(utils.GetMachineClientCertDir(), "ca.pem")
clientCert := filepath.Join(utils.GetMachineClientCertDir(), "cert.pem")
clientKey := filepath.Join(utils.GetMachineClientCertDir(), "key.pem")