merge

Author: anandkumarpatel

configs/.env

@@ -1,6 +1,7 @@
 LOG_ERRORS=true
 TOKEN_EXPIRES="1 year"
 REDIS_KEY_EXPIRES="5 minutes"
+REDIS_LOCK_EXPIRES="6 minutes"
 DOCK_PROJECT_LIMIT=100000000
 DEPLOY_COMMAND="echo DEPLOY"
 COOKIE_SECRET="\$up3r,$3<r3t"
@@ -17,7 +18,7 @@ GITHUB_DEPLOY_KEY_BITS=2048
 HASHIDS_SALT="VvCCYj8x3xaHs44QiDp9"
 HASHIDS_LENGTH=6
 DOCKER_IMAGE_BUILDER_NAME="runnable/image-builder"
-DOCKER_IMAGE_BUILDER_VERSION="d1.3.1-v1.4.2"
+DOCKER_IMAGE_BUILDER_VERSION="d1.3.1-v1.4.3"
 DOCKER_IMAGE_BUILDER_CACHE="/tmp"
 BUILD_END_TIMEOUT=100
 DATADOG_HOST="localhost"

lib/middlewares/create-class-middleware.js

@@ -4,6 +4,7 @@ var keypather = require('keypather')();
 var fno = require('fn-object');
 var isString = require('101/is-string');
 var isObject = require('101/is-object');
+var exists = require('101/exists');
 
 module.exports = function (key, Model) {
   return new ClassMiddleware(key, Model);
@@ -88,7 +89,8 @@ function valIsFunction (obj) {
 function replacePlaceholders (req) {
   return function (arg) {
     if (isString(arg)) {
-      return keypather.get(req, arg) || arg;
+      var value = keypather.get(req, arg);
+      return exists(value) ? value : arg;
     }
     else if (Array.isArray(arg)) {
       return arg.map(replacePlaceholders(req));

lib/models/apis/docker.js

@@ -264,22 +264,45 @@ Docker.prototype.getLogs = function (containerId, tail, cb) {
   }
 };
 
-
-
-Docker.prototype.createAndInspectContainer = function (version, opts, cb) {
-  debug('createAndInspectContainer', formatArgs(arguments));
-  var self = this;
-  if (typeof opts === 'function') {
+/**
+ * creates a user container
+ * @param version: version object which containes build
+ * @param opts:    opts to pass to docker
+ * @param cb: Callback
+ */
+Docker.prototype.createUserContainer = function (version, opts, cb) {
+  debug('createUserContainer', formatArgs(arguments));
+  if (!version.build || !version.build.dockerTag) {
+    return cb(Boom.badRequest('Cannot create a container for an unbuilt version', {
+      debug: { versionId: version._id.toString() }
+    }));
+  }
+  if (isFunction(opts)) {
     cb = opts;
     opts = {};
   }
-  // Create opts
-  opts.create = opts.create || {};
-  extend(opts.create, {
+  extend(opts, {
     Image: version.build.dockerTag
   });
-  // Start opts
-  opts.start = opts.start || {};
+
+  this.createContainer(opts, cb);
+};
+
+/**
+ * start a user container
+ * @param container: container object to start
+ * @param opts:      opts to pass to docker
+ * @param cb: Callback
+ */
+Docker.prototype.startUserContainer = function (container, opts, cb) {
+  debug('startUserContainer', formatArgs(arguments));
+  if (!container) {
+    return cb(Boom.badRequest('Container must be provided to start'));
+  }
+  if (isFunction(opts)) {
+    cb = opts;
+    opts = {};
+  }
 
   // order matters here , our custom DNS should come first
   var dns = [];
@@ -288,40 +311,31 @@ Docker.prototype.createAndInspectContainer = function (version, opts, cb) {
   }
   dns.push(process.env.DNS_DEFAULT_IPADDRESS);
 
-  extend(opts.start, {
+  extend(opts, {
     PublishAllPorts: true,
     Dns: dns
   });
 
-  async.waterfall([
-    createContainer,
-    startContainer
-  ], cb);
-  function createContainer (cb) {
-    self.createContainer(opts.create, cb);
-  }
-  function startContainer (container, cb) {
-    self.startContainer(container, opts.start, function (err) {
-      cb(err, container);
-    });
-  }
+  this.startContainer(container, opts, cb);
 };
 
-Docker.prototype.createContainerForVersion = function (version, opts, cb) {
-  debug('createContainerForVersion', formatArgs(arguments));
-  if (typeof opts === 'function') {
-    cb = opts;
-    opts = {};
-  }
-  if (!version.build || !version.build.dockerImage) {
-    return cb(Boom.badRequest('Cannot create a container for an unbuilt version', {
-      debug: { versionId: version._id.toString() }
-    }));
+/**
+ * inspect a user container
+ * @param container: container object to inspect
+ * @param cb: Callback
+ */
+Docker.prototype.inspectUserContainer = function (container, cb) {
+  debug('inspectUserContainer', formatArgs(arguments));
+  if (!container) {
+    return cb(Boom.badRequest('Container must be provided to start'));
   }
-  this.createAndInspectContainer(version, opts, cb);
+  var self = this;
+  self.inspectContainer(container, function(err, inspect) {
+    if (err) { return cb(err); }
+    inspect.dockerHost = self.dockerHost;
+    cb(null, inspect);
+  });
 };
-
-
 /**
  * CONTAINER METHODS - START
  */
@@ -334,7 +348,7 @@ Docker.prototype.createContainerForVersion = function (version, opts, cb) {
 Docker.prototype.createContainer = function (opts, cb) {
   debug('createContainer', formatArgs(arguments));
   var self = this;
-  if (typeof opts === 'function') {
+  if (isFunction(opts)) {
     cb = opts;
     opts = {};
   }
@@ -370,7 +384,7 @@ Docker.prototype.startContainer = function (container, opts, cb) {
   debug('startContainer', formatArgs(arguments));
   var self = this;
   var containerId = container.dockerContainer || container.Id;
-  if (typeof opts === 'function') {
+  if (isFunction(opts)) {
     cb = opts;
     opts = {};
   }
@@ -395,9 +409,20 @@ Docker.prototype.restartContainer = function (container, cb) {
       self.handleErr(cb, 'Restart container failed', { containerId: containerId }));
 };
 
+/**
+ * pulls image and returns stream
+ * @param contextVersion - format 'myrepo/myname:tag'
+ * @param cb: Callback
+ */
+Docker.prototype.pullImage = function (version, cb) {
+  debug('pullImage', formatArgs(arguments));
+  var self = this;
+  self.docker.pull(version.build.dockerTag, cb);
+};
+
 /**
  * attempts to stop a running container.
- * if not stoped in passed in time, the process is kill 9'd
+ * if not stopped in passed in time, the process is kill 9'd
  * @param container  docker container or mongo container object
  * @param force      Force stop a container. Ignores 'already stopped' error.
  * @param cb         callback

lib/models/apis/mavis.js

@@ -6,6 +6,8 @@ var ApiClient = require('simple-api-client');
 var util = require('util');
 var Boom = require('dat-middleware').Boom;
 var debug = require('debug')('runnable-api:mavis:model');
+var isObject = require('101/is-object');
+var isFunction = require('101/is-function');
 
 module.exports = Mavis;
 
@@ -23,7 +25,37 @@ util.inherits(Mavis, ApiClient);
  */
 Mavis.prototype.findDockForNetwork = function (cb) {
   debug('findDockForNetwork', formatArgs(arguments));
-  this.findDock('container_run', cb);
+  this.findDockForContainer({}, cb);
+};
+
+Mavis.prototype.findDockForBuild = function (contextVersion, cb) {
+  debug('findDockForBuild', formatArgs(arguments));
+
+  if (!isObject(contextVersion)) {
+    return cb(new Error('missing contextVersion'));
+  }
+
+  var opts =  {
+    type: 'container_build'
+  };
+  opts.prevDuration = contextVersion.duration || 0;
+  opts.prevImage = contextVersion.dockerTag || null;
+  this.findDock(opts, cb);
+};
+
+Mavis.prototype.findDockForContainer = function (contextVersion, cb) {
+  debug('findDockForContainer', formatArgs(arguments));
+
+  if (!isObject(contextVersion)) {
+    return cb(new Error('missing contextVersion'));
+  }
+
+  var opts =  {
+    type: 'container_run'
+  };
+  // if dockerHost is not an address, its invalid
+  opts.prevDock = contextVersion.dockerHost || null;
+  this.findDock(opts, cb);
 };
 
 /**
@@ -32,23 +64,11 @@ Mavis.prototype.findDockForNetwork = function (cb) {
  * @param prevDock: previous dock this image was run on
  * @param cb: Callback
  */
-Mavis.prototype.findDock = function (taskType, prevDock, cb) {
-  if (typeof prevDock === 'function') {
-    cb = prevDock;
-    prevDock = null;
-  }
-
-  // if prevDock is not an address, its invalid
-  if(prevDock && !~prevDock.indexOf('http')){
-    prevDock = null;
-  }
+Mavis.prototype.findDock = function (opts, cb) {
   // path must have trailing slash to ensure this is a file
   var self = this;
   this.post('dock', {
-    json: {
-      type: taskType,
-      prevDock: prevDock
-    }
+    json: opts
   }, function (err, res) {
     if (err) {
       var boomErr = Boom.create(504, 'Unable to find dock', {
@@ -99,10 +119,6 @@ function responseErr (res) {
   });
 }
 
-// TODO: add all the findDock types
-// Mavis.prototype.findDockForContainerCreate
-
-var isFunction = require('101/is-function');
 function formatArgs (args) {
   return Array.prototype.slice.call(args)
     .map(function (arg) {

lib/models/apis/runnable.js

@@ -10,6 +10,8 @@ var RunnableUser = require('runnable');
 var Base = require('runnable/lib/models/base');
 var debug = require('debug')('runnable-api:runnable:model');
 
+var isFunction = require('101/is-function');
+
 Base.prototype.parse = function (attrs) {
   if (attrs.toJSON) {
     attrs = attrs.toJSON();
@@ -61,25 +63,20 @@ util.inherits(Runnable, RunnableUser);
  * @param instances
  * @param cb
  */
-Runnable.prototype.redeployInstance = function (instance, buildId, cb) {
+Runnable.prototype.redeployInstance = function (instance, opts, cb) {
   debug('redeployInstance', formatArgs(arguments));
-  if (typeof buildId === 'function') {
-    // (instance, cb)
-    cb = buildId;
-    buildId = null;
+  if (isFunction(opts)) {
+    cb = opts;
+    opts = {};
   }
-  var opts = (buildId) ?
-    { json: { build: buildId.toString() } } :
-    {};
-
   var instanceModel = this.newInstance(instance.shortHash);
   var retries = 0;
   var maxRetries = 15;
   redeploy();
   function redeploy () {
     instanceModel.redeploy(opts, function (err) {
       if (err) {
-        if (err.output.statusCode === 409 && buildId) {
+        if (err.output.statusCode === 409 && opts.json.build) {
           // only attempt retries if buildId is provided
           setTimeout(function () {
             attemptRetry(err);

lib/models/events/docker.js

@@ -23,23 +23,28 @@ DockerEvents.prototype.listen = function (cb) {
   debug('listen', arguments);
   cb = cb || noop;
   if (this.closeHandler) {
-    return cb(new Error('closing'));
+    return cb(Boom.conflict('closing events listener is in progress'));
   }
   this.subscribeAll();
   cb();
 };
 
 DockerEvents.prototype.close = function (cb) {
   debug('close', arguments, this.eventLockCount);
+  cb = cb || noop;
   if (this.closeHandler) {
-    return cb(new Error('already closing'));
+    return cb(Boom.conflict('already closing events listener'));
   }
+  var self = this;
   this.unsubscribeAll();
-  this.closeHandler = cb || noop;
+  this.closeHandler = cb;
   if (this.eventLockCount <= 0) {
     this.eventLockCount = 0; // to be safe
-    cb();
-    delete this.closeHandler;
+    // prevent sync callback
+    process.nextTick(function () {
+      self.closeHandler();
+      delete self.closeHandler;
+    });
   }
 };
 
@@ -110,7 +115,12 @@ DockerEvents.prototype.getEventLock = function (eventId, cb) {
 
 DockerEvents.prototype.handleDie = function (data) {
   debug('handleDie', arguments);
-  if (this.closeHandler) { return; } // this api is closing and will not handle any new events.
+  // this api is closing and will not handle any new events.
+  if (this.closeHandler) {
+    // this debug statement is covered with unit test. Don't change/remove it.
+    // see unit/docker-events.js
+    return debug('events are stopping');
+  }
   var self = this;
   var errDebug = {
     event: 'die',
@@ -126,7 +136,11 @@ DockerEvents.prototype.handleDie = function (data) {
   var containerId = data.id;
   activeApi.isMe(function (err, meIsActiveApi) {
     if (err) { return logErr(err); }
-    if (!meIsActiveApi) { return debug('not active api'); }
+    if (!meIsActiveApi) {
+      // this debug statement is covered with unit test. Don't change/remove it.
+      // see unit/docker-events.js
+      return debug('not active api');
+    }
     self.getEventLock(data.uuid, function (err, eventMutex) {
       if (err) { return logErr(err); }
       var userStoppedContainer = new UserStoppedContainer(containerId);