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

Merge branch 'master' of github.com:kitematic/kitematic

This commit is contained in:
Jeff Morgan 2014-08-27 18:13:28 -07:00
parent aa0bf724ae 9a38c16970
commit 9a3ee1e363
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meteor/client/stylesheets/dashboard.import.less vendored
View File

@ -148,6 +148,7 @@
} }
min-height: @dashboard-content-height; min-height: @dashboard-content-height;
max-height: @dashboard-content-height; max-height: @dashboard-content-height;
overflow-x: hidden;
overflow-y: overlay; overflow-y: overlay;
} }
.nav-tabs > li, .nav-tabs > li,

11
meteor/server/apps.js
View File

@ -1,7 +1,7 @@
var watchers = {}; var watchers = {};
removeBindFolder = function (name, callback) { removeBindFolder = function (name, callback) {
exec(path.join(getBinDir(), 'boot2docker') + ' ssh "rm -rf /var/lib/docker/binds/' + name + '"', function(err, stdout) { exec(path.join(getBinDir(), 'boot2docker') + ' ssh "sudo rm -rf /var/lib/docker/binds/' + name + '"', function(err, stdout) {
callback(err, stdout); callback(err, stdout);
}); });
}; };
@ -104,7 +104,7 @@ recoverApps = function (callback) {
} }
var container = docker.getContainer(app.docker.Id); var container = docker.getContainer(app.docker.Id);
container.inspect(function (err, data) { container.inspect(function (err, data) {
if (app.status !== 'STARTING' && !data.State.Running) { if (app.status !== 'STARTING' && data && data.State && !data.State.Running) {
console.log('restarting: ' + app.name); console.log('restarting: ' + app.name);
console.log(app.docker.Id); console.log(app.docker.Id);
Fiber(function () { Fiber(function () {
@ -181,9 +181,16 @@ Meteor.methods({
var image = Images.findOne(appObj.imageId); var image = Images.findOne(appObj.imageId);
loadKiteVolumes(image.path, appObj.name); loadKiteVolumes(image.path, appObj.name);
var app = Apps.findOne(appId); var app = Apps.findOne(appId);
removeBindFolder(app.name, function (err) {
if (err) {
console.error(err);
}
Fiber(function () {
Meteor.call('runApp', app, function (err) { Meteor.call('runApp', app, function (err) {
if (err) { throw err; } if (err) { throw err; }
}); });
}).run();
});
} }
}, },
getAppLogs: function (appId) { getAppLogs: function (appId) {

4
meteor/server/docker.js
View File

@ -128,7 +128,7 @@ var getFromImage = function (dockerfile) {
var regex = new RegExp(patternString, "g"); var regex = new RegExp(patternString, "g");
var fromInstruction = dockerfile.match(regex); var fromInstruction = dockerfile.match(regex);
if (fromInstruction && fromInstruction.length > 0) { if (fromInstruction && fromInstruction.length > 0) {
return fromInstruction[0].split(' ')[1].trim(); return fromInstruction[0].replace('FROM', '').trim();
} else { } else {
return null; return null;
} }
@ -199,12 +199,14 @@ createTarFileSync = function (image) {
var convertVolumeObjToArray = function (obj) { var convertVolumeObjToArray = function (obj) {
var result = []; var result = [];
if (obj !== null && typeof obj === 'object') {
_.each(_.keys(obj), function (key) { _.each(_.keys(obj), function (key) {
var volumeObj = {}; var volumeObj = {};
volumeObj.Path = key; volumeObj.Path = key;
volumeObj.Value = obj[key]; volumeObj.Value = obj[key];
result.push(volumeObj); result.push(volumeObj);
}); });
}
return result; return result;
}; };