Merge pull request #427 from CodeNow/filter-image-builder-event

add image ignore

Author: bkendall

configs/.env

@@ -17,6 +17,7 @@ GITHUB_DEPLOY_KEYS_POOL_SIZE=100
 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.3"
 DOCKER_IMAGE_BUILDER_CACHE="/tmp"
 BUILD_END_TIMEOUT=100

lib/models/apis/docker.js

@@ -117,7 +117,7 @@ Docker.prototype.createImageBuilderAndAttach = function (sessionUser, version, c
     var self = this;
     debug('create container');
     var builderContainerData = {
-      Image: 'runnable/image-builder:' + process.env.DOCKER_IMAGE_BUILDER_VERSION,
+      Image: process.env.DOCKER_IMAGE_BUILDER_NAME + ':' + process.env.DOCKER_IMAGE_BUILDER_VERSION,
       Env  : getEnvForImageBuilder(version, dockerTag),
       Binds: []
     };

lib/models/events/docker.js

@@ -130,6 +130,9 @@ DockerEvents.prototype.handleDie = function (data) {
   if (err) {
     return logErr(err);
   }
+  if (isImageBuilder(data)) {
+    return { skip: data };
+  }
   var containerId = data.id;
   activeApi.isMe(function (err, meIsActiveApi) {
     if (err) { return logErr(err); }
@@ -178,7 +181,12 @@ DockerEvents.prototype.handleDie = function (data) {
   }
 };
 
+function isImageBuilder (data) {
+  return ~data.from.indexOf(process.env.DOCKER_IMAGE_BUILDER_NAME);
+}
+
 function validateDieEventData (data) {
+  /*jshint maxcomplexity:6*/
   if (!data.uuid) {
     return Boom.badRequest('Invalid data: uuid is missing');
   }
@@ -191,6 +199,9 @@ function validateDieEventData (data) {
   if (!data.host) {
     return Boom.badRequest('Invalid data: host is missing');
   }
+  if (!data.from) {
+    return Boom.badRequest('Invalid data: from is missing');
+  }
 }
 
 // Singleton

unit/docker-events.js

@@ -70,6 +70,18 @@ describe('Docker Events', function () {
       dockerEvents.handleDie({uuid: 'some-uuid', id: 'some-id', time: new Date().getTime() });
     });
 
+    it('should return if image builder image', function (done) {
+      var out = dockerEvents.handleDie({
+        uuid: 'some-uuid',
+        id: 'some-id',
+        time: new Date().getTime(),
+        host: 'http://localhost:4243',
+        from: process.env.IMAGE_BUILDER
+      });
+      expect(out).to.have.property('skip');
+      done();
+    });
+
     describe('while closing', function () {
       afterEach(dockerEvents.close.bind(dockerEvents));
 
@@ -133,7 +145,8 @@ describe('Docker Events', function () {
           uuid: 'some-uuid',
           id: 'some-id',
           time: new Date().getTime(),
-          host: 'http://127.0.0.1:4242'
+          host: 'http://127.0.0.1:4242',
+          from: 'container/name'
         };
         de.handleDie(data);
       });
@@ -244,7 +257,8 @@ describe('Docker Events', function () {
           uuid: uuid(),
           id: 'some-id',
           time: new Date().getTime(),
-          host: 'http://localhost:4243'
+          host: 'http://localhost:4243',
+          from: 'container/name'
         };
         dockerEvents.handleDie(payload);
         dockerEvents.handleDie(payload);