Merge branch 'hotfix-dedupe' of github.com:CodeNow/api into hotfix-dedupe

Author: tjmehta

lib/models/apis/docker.js

@@ -127,17 +127,7 @@ Docker.prototype.createImageBuilderAndAttach = function (sessionUser, version, c
         '/cache': {}
       };
     }
-    self.createContainer(builderContainerData, function (err, container) {
-      debug('container created - ', 'err:', err, 'container:', container);
-      if (err) { return cb(err); }
-      var containerId = container.Id;
-
-      version.update({
-        $set: { containerId: containerId }
-      }, error.logIfErr);
-
-      cb(null, container);
-    });
+    self.createContainer(builderContainerData, cb);
   }
 };
 

lib/routes/builds.js

@@ -20,7 +20,6 @@ var checkFound = require('middlewares/check-found');
 var Boom = mw.Boom;
 var runnable = require('middlewares/apis').runnable;
 var error = require('error');
-var createCount = require('callback-count');
 var pluck = require('101/pluck');
 var noop = require('101/noop');
 
@@ -237,11 +236,8 @@ app.post('/builds/:id/actions/build',
       ).catch(
         function (err, req, res, next) {
           error.log(err, req);
-          var count = createCount(2, next);
-          req.contextVersion.updateBuildError(err,
-            logIfErrAndNext(count.next.bind(count)));
           req.build.modifyErrored(req.contextVersion._id,
-            logIfErrAndNext(count.next.bind(count)));
+            logIfErrAndNext(next));
         }
       )
     ),