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

version bump

This commit is contained in:
Jeffrey Morgan 2015-05-08 20:53:31 -07:00
parent 34f6b7169d
commit c75bc2188e
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "Kitematic", "name": "Kitematic",
"version": "0.5.23", "version": "0.5.24",
"author": "Kitematic", "author": "Kitematic",
"description": "Simple Docker Container management for Mac OS X.", "description": "Simple Docker Container management for Mac OS X.",
"homepage": "https://kitematic.com/", "homepage": "https://kitematic.com/",
@ -47,7 +47,7 @@
"<rootDir>/node_modules/source-map-support" "<rootDir>/node_modules/source-map-support"
] ]
}, },
"docker-version": "1.6.0", "docker-version": "1.6.1",
"docker-machine-version": "0.2.0", "docker-machine-version": "0.2.0",
"electron-version": "0.24.0", "electron-version": "0.24.0",
"virtualbox-version": "4.3.26", "virtualbox-version": "4.3.26",

2
src/components/Containers.react.js
View File

@ -71,8 +71,6 @@ var Containers = React.createClass({
this.context.router.transitionTo('containerHome', {name: name}); this.context.router.transitionTo('containerHome', {name: name});
} else if (status === 'pending' && ContainerStore.pending()) { } else if (status === 'pending' && ContainerStore.pending()) {
this.context.router.transitionTo('pull'); this.context.router.transitionTo('pull');
} else if (status === 'destroy') {
this.onDestroy();
} }
}, },
handleScroll: function (e) { handleScroll: function (e) {

5
src/stores/SetupStore.js
View File

@ -63,7 +63,10 @@ var _steps = [{
run: Promise.coroutine(function* (progressCallback) { run: Promise.coroutine(function* (progressCallback) {
setupUtil.simulateProgress(this.seconds, progressCallback); setupUtil.simulateProgress(this.seconds, progressCallback);
var exists = yield machine.exists(); var exists = yield machine.exists();
if (!exists) { if (!exists || (yield machine.state()) === 'Error') {
if ((yield machine.state()) === 'Error') {
yield machine.rm();
}
yield machine.create(); yield machine.create();
if(util.isWindows()) { if(util.isWindows()) {
let home = util.home(); let home = util.home();