docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correct *.pem names to work with DOCKER_CERT_PATH 

See https://github.com/docker/docker/blob/master/docker/docker.go#L22

This is how things currently work with b2d.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
This commit is contained in:
Nathan LeClaire 2015-01-16 13:54:05 -08:00
parent 0c8ef0abe5
commit 4bc7dc5676
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
commands.go
View File

@ -230,8 +230,8 @@ func cmdConfig(c *cli.Context) {
storeDir := store.Path storeDir := store.Path
caCert := filepath.Join(storeDir, name, "ca.pem") caCert := filepath.Join(storeDir, name, "ca.pem")
clientCert := filepath.Join(storeDir, name, "client.pem") clientCert := filepath.Join(storeDir, name, "cert.pem")
clientKey := filepath.Join(storeDir, name, "client-key.pem") clientKey := filepath.Join(storeDir, name, "key.pem")
machineUrl, err := host.GetURL() machineUrl, err := host.GetURL()
if err != nil { if err != nil {
log.Fatalf("Error getting machine url: %s", err) log.Fatalf("Error getting machine url: %s", err)

4
host.go
View File

@ -129,8 +129,8 @@ func (h *Host) GenerateCertificates(serverIPs []string) error {
return fmt.Errorf("error generating server cert: %s", err) return fmt.Errorf("error generating server cert: %s", err)
} }
clientCertPath := filepath.Join(h.storePath, "client.pem") clientCertPath := filepath.Join(h.storePath, "cert.pem")
clientKeyPath := filepath.Join(h.storePath, "client-key.pem") clientKeyPath := filepath.Join(h.storePath, "key.pem")
log.Debugf("generating client cert: %s", clientCertPath) log.Debugf("generating client cert: %s", clientCertPath)
if err := utils.GenerateCert([]string{""}, clientCertPath, clientKeyPath, caCertPath, privateKeyPath, org, bits); err != nil { if err := utils.GenerateCert([]string{""}, clientCertPath, clientKeyPath, caCertPath, privateKeyPath, org, bits); err != nil {
return fmt.Errorf("error generating client cert: %s", err) return fmt.Errorf("error generating client cert: %s", err)