Spearhead/joyent-portal
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix(portal-data): infer container id from machine_id (they are not the same)

Browse Source
This commit is contained in:
Sérgio Ramos 2017-06-28 11:06:02 +01:00 committed by Judit Greskovits
parent b3581a61d2
commit a2e0100f5e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/portal-data/lib/index.js
View File

@ -1002,7 +1002,7 @@ module.exports = class Data extends EventEmitter {
return next(err); return next(err);
} }
const container = this._docker.getContainer(instance.machine_id); const container = this._docker.getContainer(instance.machine_id.split(/\-/)[0]);
container.stop(next); container.stop(next);
}); });
}, },
@ -1038,7 +1038,7 @@ module.exports = class Data extends EventEmitter {
return next(err); return next(err);
} }
const container = this._docker.getContainer(instance.machine_id); const container = this._docker.getContainer(instance.machine_id.split(/\-/)[0]);
container.start(next); container.start(next);
}); });
}, },
@ -1074,7 +1074,7 @@ module.exports = class Data extends EventEmitter {
return next(err); return next(err);
} }
const container = this._docker.getContainer(instance.machine_id); const container = this._docker.getContainer(instance.machine_id.split(/\-/)[0]);
container.restart(next); container.restart(next);
}); });
}, },
@ -1112,7 +1112,7 @@ module.exports = class Data extends EventEmitter {
return next(err); return next(err);
} }
const container = this._docker.getContainer(instance.machine_id); const container = this._docker.getContainer(instance.machine_id.split(/\-/)[0]);
// Use force in case the container is running. TODO: should we keep force? // Use force in case the container is running. TODO: should we keep force?
container.remove({ force: true }, next); container.remove({ force: true }, next);
}); });
@ -1220,7 +1220,7 @@ module.exports = class Data extends EventEmitter {
VAsync.forEachParallel({ VAsync.forEachParallel({
func: (instance, next) => { func: (instance, next) => {
const container = this._docker.getContainer(instance.machine_id); const container = this._docker.getContainer(instance.machine_id.split(/\-/)[0]);
container.stop(next); container.stop(next);
}, },
inputs: instances inputs: instances
@ -1246,7 +1246,7 @@ module.exports = class Data extends EventEmitter {
VAsync.forEachParallel({ VAsync.forEachParallel({
func: (instance, next) => { func: (instance, next) => {
const container = this._docker.getContainer(instance.machine_id); const container = this._docker.getContainer(instance.machine_id.split(/\-/)[0]);
container.start((err) => { container.start((err) => {
if (err) { if (err) {
return next(err); return next(err);
@ -1286,7 +1286,7 @@ module.exports = class Data extends EventEmitter {
VAsync.forEachParallel({ VAsync.forEachParallel({
func: (instance, next) => { func: (instance, next) => {
this.updateInstance({ id: instance.id, status: 'RESTARTING' }, () => { this.updateInstance({ id: instance.id, status: 'RESTARTING' }, () => {
const container = this._docker.getContainer(instance.machine_id); const container = this._docker.getContainer(instance.machine_id.split(/\-/)[0]);
container.restart(next); container.restart(next);
}); });
}, },