Merge pull request #606 from lucamaraschi/master

Added .dockerignore support for build

lib/docker.js

@@ -14,7 +14,11 @@ var EventEmitter = require('events').EventEmitter,
   Node = require('./node'),
   Exec = require('./exec'),
   util = require('./util'),
-  extend = util.extend;
+  extend = util.extend,
+  path = require('path'),
+  extend = util.extend,
+  ignore = require('@balena/dockerignore'),
+  fs = require('fs');
 
 var Docker = function(opts) {
   if (!(this instanceof Docker)) return new Docker(opts);
@@ -302,6 +306,14 @@ Docker.prototype.buildImage = function(file, opts, callback) {
   }
 
   if (file && file.context) {
+    let entries = file.src
+
+    const dockerignorePath = path.join(file.context, '.dockerignore')
+    if (fs.existsSync(dockerignorePath)) {
+      const dockerIgnore = ignore({ ignorecase: false }).add(fs.readFileSync(dockerignorePath).toString())
+      entries = (entries || []).filter(dockerIgnore.createFilter())
+    }
+
     var pack = tar.pack(file.context, {
       entries: file.src.slice()
     });

package.json

@@ -15,6 +15,7 @@
     "docker.io"
   ],
   "dependencies": {
+    "@balena/dockerignore": "^1.0.2",
     "docker-modem": "^3.0.0",
     "tar-fs": "~2.0.1"
   },

test/.dockerignore

@@ -0,0 +1 @@
+test.tar

test/docker.js

@@ -131,6 +131,28 @@ describe("#docker", function() {
       }, {}, handler);
     });
 
+    it("should build image from multiple files while respecting the dockerignore file", function(done) {
+      this.timeout(60000);
+
+      function handler(err, stream) {
+        expect(err).to.be.null;
+        expect(stream).to.be.ok;
+
+        stream.pipe(process.stdout, {
+          end: true
+        });
+
+        stream.on('end', function() {
+          done();
+        });
+      }
+
+      docker.buildImage({
+        context: __dirname,
+        src: ['Dockerfile', '.dockerignore', 'test.tar']
+      }, {}, handler);
+    });
+
     it("should not mutate src array", function(done) {
       this.timeout(60000);
 
@@ -157,7 +179,6 @@ describe("#docker", function() {
     });
   });
 
-
   describe("#loadImage", function() {
     it("should load image from readable stream", function(done) {
       this.timeout(60000);