From a2e0100f5e6e598984b1e5575bee251cef8e5cfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Se=CC=81rgio=20Ramos?= <mail@sergioramos.me>
Date: Wed, 28 Jun 2017 11:06:02 +0100
Subject: [PATCH] fix(portal-data): infer container id from machine_id (they
 are not the same)

---
 packages/portal-data/lib/index.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/portal-data/lib/index.js b/packages/portal-data/lib/index.js
index 08494f66..6230fd7d 100644
--- a/packages/portal-data/lib/index.js
+++ b/packages/portal-data/lib/index.js
@@ -1002,7 +1002,7 @@ module.exports = class Data extends EventEmitter {
               return next(err);
             }
 
-            const container = this._docker.getContainer(instance.machine_id);
+            const container = this._docker.getContainer(instance.machine_id.split(/\-/)[0]);
             container.stop(next);
           });
         },
@@ -1038,7 +1038,7 @@ module.exports = class Data extends EventEmitter {
               return next(err);
             }
 
-            const container = this._docker.getContainer(instance.machine_id);
+            const container = this._docker.getContainer(instance.machine_id.split(/\-/)[0]);
             container.start(next);
           });
         },
@@ -1074,7 +1074,7 @@ module.exports = class Data extends EventEmitter {
               return next(err);
             }
 
-            const container = this._docker.getContainer(instance.machine_id);
+            const container = this._docker.getContainer(instance.machine_id.split(/\-/)[0]);
             container.restart(next);
           });
         },
@@ -1112,7 +1112,7 @@ module.exports = class Data extends EventEmitter {
               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?
             container.remove({ force: true }, next);
           });
@@ -1220,7 +1220,7 @@ module.exports = class Data extends EventEmitter {
 
       VAsync.forEachParallel({
         func: (instance, next) => {
-          const container = this._docker.getContainer(instance.machine_id);
+          const container = this._docker.getContainer(instance.machine_id.split(/\-/)[0]);
           container.stop(next);
         },
         inputs: instances
@@ -1246,7 +1246,7 @@ module.exports = class Data extends EventEmitter {
 
       VAsync.forEachParallel({
         func: (instance, next) => {
-          const container = this._docker.getContainer(instance.machine_id);
+          const container = this._docker.getContainer(instance.machine_id.split(/\-/)[0]);
           container.start((err) => {
             if (err) {
               return next(err);
@@ -1286,7 +1286,7 @@ module.exports = class Data extends EventEmitter {
       VAsync.forEachParallel({
         func: (instance, next) => {
           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);
           });
         },