docker pull fix + some refactoring

Author: siloenix

command/NetworkCommand.js

@@ -12,8 +12,7 @@ module.exports = class NetworkCommand extends BaseCommand {
       .then(() => log.info(`network created: '${this.name}'`));
   }
 
-  cleanUp() {
-    return timer(5000)
-      .then(() => log.info(`network removed: '${this.name}'`));
+  async cleanUp() {
+    log.info(`network removed: '${this.name}'`);
   }
 };

command/ServiceCommand.js

@@ -9,31 +9,34 @@ module.exports = class ServiceCommand extends BaseCommand {
     super(name, options)
   }
 
-  _runInternal() {
+  async _runInternal() {
     const {image} = this.options;
-    return docker
-      .pull(image, {repo: 'library'})
-      .then(() => docker.createContainer({
-        'AttachStdin': false,
-        'AttachStdout': false,
-        'AttachStderr': false,
-        'OpenStdin': false,
-        'StdinOnce': false,
-        'Cmd': [],
-        'Image': image,
-        'name': this.name
-      }))
-      .then(container => {
-        this.container = container;
-        return container.start()
-      })
-      .then(() => log.info(`service created: '${this.name}'`));
+    await docker.pull(image);
+
+    log.info(`Creating container: '${this.name}' (${image})`);
+    const container = await docker.createContainer({
+      'AttachStdin': false,
+      'AttachStdout': false,
+      'AttachStderr': false,
+      'OpenStdin': false,
+      'StdinOnce': false,
+      'Cmd': [],
+      'Image': image,
+      'name': this.name
+    });
+    this.container = container;
+
+    log.info(`Starting container: '${this.name}' (${image})`);
+    await container.start();
+
+    log.info(`Service created: '${this.name}' (${image})`);
   }
 
-  cleanUp() {
-    return timer(5000)
-      .then(() => this.container.stop())
-      .then(() => this.container.remove())
-      .then(() => log.info(`service removed: '${this.name}'`));
+  async cleanUp() {
+    if (this.container) {
+      await this.container.stop();
+      await this.container.remove();
+      log.info(`Service removed: '${this.name}' (${image})`)
+    }
   }
 };

command/VolumeCommand.js

@@ -12,8 +12,7 @@ module.exports = class VolumeCommand extends BaseCommand {
       .then(() => log.info(`volume created: '${this.name}'`));
   }
 
-  cleanUp() {
-    return timer(5000)
-      .then(() => log.info(`volume removed: '${this.name}'`));
+  async cleanUp() {
+    log.info(`network removed: '${this.name}'`);
   }
 };

docker/client.js

@@ -1,4 +1,23 @@
 const config = require('../config');
+const log = require('../logger');
 const Docker = require('dockerode');
 
-module.exports = new Docker(config.docker);
+class DockerClient extends Docker {
+  constructor(options) {
+    super(options)
+  }
+
+  async pull(image) {
+    if (!image.includes(':')) {
+      image = `${image}:latest`;
+    }
+    const stream = await super.pull(image);
+    return await new Promise((resolve, reject) => this.modem.followProgress(
+      stream,
+      (err, output) => err ? reject(err) : resolve(output),
+      event => log.info(event.status)
+    ));
+  }
+}
+
+module.exports = new DockerClient(config.docker);

services/DockerService.js

@@ -1,5 +1,6 @@
 const log = require('../logger');
 const yaml = require('parser-yaml');
+const timer = require('../helpers/timer');
 const ServiceCommand = require('../command/ServiceCommand');
 const NetworkCommand = require('../command/NetworkCommand');
 const VolumeCommand = require('../command/VolumeCommand');
@@ -10,7 +11,7 @@ module.exports = class DockerService {
     return this.applyDirectives(directives);
   }
 
-  static async applyDirectives({services, volumes, networks}) {
+  static async applyDirectives({services, volumes = {}, networks = {}}) {
     const commands = {};
 
     for (const name in services) {
@@ -33,20 +34,24 @@ module.exports = class DockerService {
 
       if (dependencies) {
         for (const dependency of dependencies) {
-          command.addDependency(getCommand(dependency, services, commands, ServiceCommand))
+          if (services[dependency]) {
+            command.addDependency(getCommand(dependency, services, commands, ServiceCommand))
+          }
         }
       }
 
       if (depNetworks) {
         for (const network of depNetworks) {
-          command.addDependency(getCommand(network, networks, commands, NetworkCommand))
+          if (networks[network]) {
+            command.addDependency(getCommand(network, networks, commands, NetworkCommand))
+          }
         }
       }
 
       if (depVolumes) {
         for (const name of depVolumes) {
           const volume = name.split(':')[0];
-          if (volumes.hasOwnProperty(volume)) {
+          if (volumes[volume]) {
             command.addDependency(getCommand(volume, volumes, commands, VolumeCommand))
           }
         }
@@ -55,7 +60,7 @@ module.exports = class DockerService {
 
     const runnable = Object.values(commands);
     await Promise.all(runnable.map(c => c.run()));
-    runnable.forEach(c => c.cleanUp());
+    timer(5000).then(() => runnable.forEach(c => c.cleanUp()));
     return {ok: true}
   }
 };