pulling image + clean up + refactoring

Author: siloenix

command/BaseCommand.js

@@ -23,7 +23,12 @@ module.exports = class Command {
   }
 
   _runInternal() {
-    log.warn('Command run on base class');
+    log.warn('Command run on base class. Please define "_runInternal()" on the child class');
+    return Promise.reject();
+  }
+
+  cleanUp() {
+    log.warn('method "cleanUp()" not defined. Please define "cleanUp()" on the child class');
     return Promise.reject();
   }
 };

command/NetworkCommand.js

@@ -1,4 +1,5 @@
 const log = require('../logger');
+const timer = require('../helpers/timer');
 const BaseCommand = require('./BaseCommand');
 
 module.exports = class NetworkCommand extends BaseCommand {
@@ -7,7 +8,12 @@ module.exports = class NetworkCommand extends BaseCommand {
   }
 
   _runInternal() {
-    return new Promise(resolve => setTimeout(resolve, 1000))
+    return timer(1000)
       .then(() => log.info(`network created: '${this.name}'`));
   }
+
+  cleanUp() {
+    return timer(5000)
+      .then(() => log.info(`network removed: '${this.name}'`));
+  }
 };

command/ServiceCommand.js

@@ -1,4 +1,5 @@
 const log = require('../logger');
+const timer = require('../helpers/timer');
 const BaseCommand = require('./BaseCommand');
 const docker = require('../docker/client');
 
@@ -11,25 +12,28 @@ module.exports = class ServiceCommand extends BaseCommand {
   _runInternal() {
     const {image} = this.options;
     return docker
-      .pull(image)
+      .pull(image, {repo: 'library'})
       .then(() => docker.createContainer({
-        'Hostname': '',
-        'User': '',
         'AttachStdin': false,
         'AttachStdout': false,
         'AttachStderr': false,
-        'Tty': false,
         'OpenStdin': false,
         'StdinOnce': false,
-        'Env': null,
         'Cmd': [],
         'Image': image,
-        'Volumes': {},
-        'VolumesFrom': [],
         'name': this.name
       }))
-      .then(container => container.start())
+      .then(container => {
+        this.container = container;
+        return container.start()
+      })
       .then(() => log.info(`service created: '${this.name}'`));
+  }
 
+  cleanUp() {
+    return timer(5000)
+      .then(() => this.container.stop())
+      .then(() => this.container.remove())
+      .then(() => log.info(`service removed: '${this.name}'`));
   }
 };

command/VolumeCommand.js

@@ -1,4 +1,5 @@
 const log = require('../logger');
+const timer = require('../helpers/timer');
 const BaseCommand = require('./BaseCommand');
 
 module.exports = class VolumeCommand extends BaseCommand {
@@ -7,7 +8,12 @@ module.exports = class VolumeCommand extends BaseCommand {
   }
 
   _runInternal() {
-    return new Promise(resolve => setTimeout(resolve, 1000))
+    return timer(1000)
       .then(() => log.info(`volume created: '${this.name}'`));
   }
+
+  cleanUp() {
+    return timer(5000)
+      .then(() => log.info(`volume removed: '${this.name}'`));
+  }
 };

helpers/timer.js

@@ -0,0 +1 @@
+module.exports = millis => new Promise(resolve => setTimeout(resolve, millis));

services/DockerService.js

@@ -53,7 +53,9 @@ module.exports = class DockerService {
       }
     }
 
-    await Promise.all(Object.values(commands).map(c => c.run()));
+    const runnable = Object.values(commands);
+    await Promise.all(runnable.map(c => c.run()));
+    runnable.forEach(c => c.cleanUp());
     return {ok: true}
   }
 };