Merge pull request #495 from CodeNow/hotfix-dedupe

Hotfix dedupe

Author: tjmehta

lib/models/apis/docker.js

@@ -117,6 +117,7 @@ Docker.prototype.createImageBuilderAndAttach = function (sessionUser, version, c
     var self = this;
     debug('create container');
     var builderContainerData = {
+      name: version.build._id.toString(),
       Image: process.env.DOCKER_IMAGE_BUILDER_NAME + ':' + process.env.DOCKER_IMAGE_BUILDER_VERSION,
       Env  : getEnvForImageBuilder(version, dockerTag),
       Binds: []
@@ -127,17 +128,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/models/mongo/context-version.js

@@ -276,10 +276,13 @@ ContextVersionSchema.methods.setBuildStarted = function (user, dockerHost, build
     buildProps = {};
   }
   var update = {};
+  // FIXME: lets get rid of cv.containerId soon (now mirrors build._id)
+  // - used for buildLogs (change to build._id)
   update.$set = {
     'build.started' : Date.now(),
     'build.triggeredBy.github': user.accounts.github.id,
-    'dockerHost': dockerHost
+    'dockerHost': dockerHost,
+    'containerId': this.build._id
   };
   Object.keys(buildProps).forEach(function (key) {
     update.$set['build.'+key] = buildProps[key];
@@ -813,6 +816,8 @@ ContextVersionSchema.methods.copyBuildFromContextVersion = function (contextVers
   var self = this;
   self.build.dupeFound = true;
   self.containerId = contextVersion.containerId;
+  // FIXME: lets get rid of cv.containerId soon (now mirrors build._id)
+  // - used for buildLogs (change to build._id)
   self.update({
     $set: {
       'build': contextVersion.build,

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));
         }
       )
     ),

package.json

@@ -85,7 +85,7 @@
     "Filibuster": "git://github.com/Runnable/Filibuster.git#v0.1.4",
     "console-trace": "git://github.com/numbcoder/console-trace.git",
     "docker-listener": "git+ssh://[email protected]:codenow/docker-listener#v0.1.1",
-    "docker-mock": "^0.5.5",
+    "docker-mock": "^0.5.7",
     "faker": "^1.0.0",
     "form-data": "^0.1.4",
     "function-proxy": "^0.5.2",