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

Fixed crash when getting container data.

This commit is contained in:
Sean Li 2014-08-27 17:03:37 -07:00
parent 2af8f51b2e
commit f103b9cf43
2 changed files with 2 additions and 1 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,

2
meteor/server/apps.js
View File

@ -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 () {