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

Honor DOCKER_CERT_PATH environment in nonNativeSetup 

Previously only certificates relative to the home folder
were honored, which made using custom storage locations
via MACHINE_STORAGE_PATH for docker machines quite
cumbersome to use.

This helps with the issue #1640.

Signed-off-by: Thomas Darimont <thomas.darimont@gmail.com>
This commit is contained in:
Thomas Darimont 2016-07-17 01:09:08 +02:00
parent 38470dd381
commit dc6aded2b0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils/DockerUtil.js
View File

@ -47,7 +47,7 @@ var DockerUtil = {
throw new Error('Cannot connect to the Docker daemon. Is the daemon running?'); throw new Error('Cannot connect to the Docker daemon. Is the daemon running?');
} }
} else { } else {
let certDir = path.join(util.home(), '.docker/machine/machines/', name); let certDir = process.env.DOCKER_CERT_PATH || path.join(util.home(), '.docker/machine/machines/', name);
if (!fs.existsSync(certDir)) { if (!fs.existsSync(certDir)) {
throw new Error('Certificate directory does not exist'); throw new Error('Certificate directory does not exist');
} }