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

Merge

This commit is contained in:
Jeffrey Morgan 2015-01-29 16:54:36 -05:00
parent 9b1edbb7e7 fba00223a2
commit 499bbc233a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/ContainerDetails.react.js
View File

@ -12,8 +12,6 @@ var ContainerUtil = require('./ContainerUtil');
var docker = require('./docker'); var docker = require('./docker');
var boot2docker = require('./boot2docker'); var boot2docker = require('./boot2docker');
var ProgressBar = require('react-bootstrap/ProgressBar'); var ProgressBar = require('react-bootstrap/ProgressBar');
var Popover = require('react-bootstrap/Popover');
var OverlayTrigger = require('react-bootstrap/OverlayTrigger');
var ContainerDetails = React.createClass({ var ContainerDetails = React.createClass({
mixins: [Router.State, Router.Navigation], mixins: [Router.State, Router.Navigation],
@ -162,6 +160,11 @@ var ContainerDetails = React.createClass({
console.log(err); console.log(err);
}); });
}, },
handleRestart: function () {
ContainerStore.restart(this.props.container.Name, function (err) {
console.log(err);
});
},
handleTerminal: function () { handleTerminal: function () {
var container = this.props.container; var container = this.props.container;
var terminal = path.join(process.cwd(), 'resources', 'terminal').replace(/ /g, '\\\\ '); var terminal = path.join(process.cwd(), 'resources', 'terminal').replace(/ /g, '\\\\ ');

1
package.json
View File

@ -68,6 +68,7 @@
"gulp-uglifyjs": "^0.5.0", "gulp-uglifyjs": "^0.5.0",
"gulp-util": "^3.0.0", "gulp-util": "^3.0.0",
"jasmine-tagged": "^1.1.2", "jasmine-tagged": "^1.1.2",
"livereload-js": "^2.2.1",
"reactify": "^0.15.2", "reactify": "^0.15.2",
"run-sequence": "^1.0.2", "run-sequence": "^1.0.2",
"vinyl-source-stream": "^0.1.1", "vinyl-source-stream": "^0.1.1",