add image ignore

Author: anandkumarpatel

configs/.env

@@ -31,3 +31,4 @@ CAYLEY="http://localhost:64210"
 REDIS_NAMESPACE="runnable:api:"
 DNS_JOB_QUEUE_INTERVAL=200
 DNS_JOB_QUEUE_INTERVAL_DELETE=60000
+IMAGE_BUILDER="runnable/image-builder"

lib/models/events/docker.js

@@ -120,6 +120,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); }
@@ -164,6 +167,10 @@ DockerEvents.prototype.handleDie = function (data) {
   }
 };
 
+function isImageBuilder (data) {
+  return ~data.from.indexOf(process.env.IMAGE_BUILDER);
+}
+
 function validateDieEventData (data) {
   if (!data.uuid) {
     return Boom.badRequest('Invalid data: uuid is missing');
@@ -177,6 +184,10 @@ function validateDieEventData (data) {
   if (!data.host) {
     return Boom.badRequest('Invalid data: host is missing');
   }
+  if (!data.from) {
+    console.log('missing');
+    return Boom.badRequest('Invalid data: from is missing');
+  }
 }
 
 // Singleton

unit/docker-events.js

@@ -69,6 +69,30 @@ describe('Docker Events', function () {
       dockerEvents.handleDie({uuid: 'some-uuid', id: 'some-id', time: new Date().getTime() });
     });
 
+    it('should fail if event data has no from', function (done) {
+      error.log = function (err) {
+        expect(err.output.payload.message).to.equal('Invalid data: from is missing');
+        done();
+      };
+      dockerEvents.handleDie({
+        uuid: 'some-uuid',
+        id: 'some-id',
+        time: new Date().getTime(),
+        host: 'http://localhost:4243'
+      });
+    });
+
+    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();
+    });
   });
 
 
@@ -129,7 +153,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);