mirror of https://github.com/docker/docs.git
Merge branch 'master' into jmorgan_bump_0.4.1
This commit is contained in:
commit
f4e16f8136
|
@ -68,10 +68,11 @@ AppUtil.remove = function (appId) {
|
||||||
var app = Apps.findOne(appId);
|
var app = Apps.findOne(appId);
|
||||||
if (app.docker) {
|
if (app.docker) {
|
||||||
Docker.removeContainer(app.docker.Id, function (err) {
|
Docker.removeContainer(app.docker.Id, function (err) {
|
||||||
Apps.remove({_id: appId});
|
|
||||||
var appPath = path.join(Util.KITE_PATH, app.name);
|
var appPath = path.join(Util.KITE_PATH, app.name);
|
||||||
Util.deleteFolder(appPath);
|
Util.deleteFolder(appPath);
|
||||||
});
|
});
|
||||||
|
} else {
|
||||||
|
Apps.remove({_id: appId});
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue