Merge pull request #793 from pipex/build-image-from-cache

Use JSON serialization for cachefrom option

Author: apocas

lib/docker.js

@@ -286,6 +286,10 @@ Docker.prototype.buildImage = function(file, opts, callback) {
       optsf.authconfig = optsf.options.authconfig;
       delete optsf.options.authconfig;
     }
+
+    if (opts.cachefrom && Array.isArray(opts.cachefrom)) {
+      optsf.options.cachefrom = JSON.stringify(opts.cachefrom);
+    }
   }
 
   function dial(callback) {

test/docker.js

@@ -149,6 +149,28 @@ describe("#docker", function() {
       }, { t: 'multiple-files' }, handler);
     });
 
+    it("should build image from multiple files using cache", 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']
+      }, { t: 'multiple-files-cachefrom', 'cachefrom': ['ubuntu:latest'] }, handler);
+    });
+
     it("should build image from multiple files while respecting the .dockerignore file", function(done) {
       this.timeout(60000);