docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-06 12:54:24 +03:00
Code Activity

Fix for bugs upgrade 0.2.3 -> 0.3.0

Browse Source
This commit is contained in:
Jeff Morgan
2014-10-19 20:44:06 -07:00
parent bbb83a5574
commit dc0c8d3a5f
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
meteor/client/lib/docker.js
View File

@@ -8,18 +8,21 @@ Docker = {};
Docker.DEFAULT_IMAGES_FILENAME = 'base-images-0.0.2.tar.gz';
Docker.DEFAULT_IMAGES_CHECKSUM = 'a3517ac21034a1969d9ff15e3c41b1e2f1aa83c67b16a8bd0bc378ffefaf573b'; // Sha256 Checksum
Docker.CERT_DIR = path.join(process.env[(process.platform === 'win32') ? 'USERPROFILE' : 'HOME'], '.boot2docker/certs/kitematic-vm');
Docker.HOST_IP = '192.168.60.103';
Docker.HOST_PORT = '2376';
Docker.client = function () {
var certDir = path.join(process.env[(process.platform === 'win32') ? 'USERPROFILE' : 'HOME'], '.boot2docker/certs/kitematic-vm');
if (!fs.existsSync(certDir)) {
return null;
}
return new Dockerode({
protocol: 'https',
host: Docker.HOST_IP,
port: Docker.HOST_PORT,
ca: fs.readFileSync(path.join(Docker.CERT_DIR, 'ca.pem')),
cert: fs.readFileSync(path.join(Docker.CERT_DIR, 'cert.pem')),
key: fs.readFileSync(path.join(Docker.CERT_DIR, 'key.pem'))
ca: fs.readFileSync(path.join(certDir, 'ca.pem')),
cert: fs.readFileSync(path.join(certDir, 'cert.pem')),
key: fs.readFileSync(path.join(certDir, 'key.pem'))
});
};

1
meteor/client/lib/router.js
View File

@@ -70,7 +70,6 @@ Router.map(function () {
// There's an install but it's lower than the current version, re-run as an 'update'.
Session.set('isUpdating', true);
}
Session.set('installing', true);
this.redirect('/setup/intro');
} else {
this.redirect('/apps');