From 3918beb79ab28c9b17e64f5b8f264dda8c1ca4ca Mon Sep 17 00:00:00 2001
From: Collin Estes <Collin.j.estes@gmail.com>
Date: Mon, 11 Jan 2016 14:55:55 -0600
Subject: [PATCH] Enable stream input on loadImage

Also added loadImage test case.
---
 lib/docker.js      |   1 +
 test/docker.js     |  24 ++++++++++++++++++++++++
 test/test-load.tar | Bin 0 -> 13824 bytes
 3 files changed, 25 insertions(+)
 create mode 100644 test/test-load.tar

diff --git a/lib/docker.js b/lib/docker.js
index fe6d164..138b54c 100644
--- a/lib/docker.js
+++ b/lib/docker.js
@@ -88,6 +88,7 @@ Docker.prototype.loadImage = function(file, opts, callback) {
     method: 'POST',
     options: opts,
     file: file,
+    isStream: true,
     statusCodes: {
       200: true,
       500: 'server error'
diff --git a/test/docker.js b/test/docker.js
index 817daa9..f0d27b3 100644
--- a/test/docker.js
+++ b/test/docker.js
@@ -80,6 +80,30 @@ describe("#docker", function() {
     });
   });
 
+
+  describe("#loadImage", function() {
+    it("should load image from readable stream", 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();
+        });
+      }
+
+      // test-save.tar => 'docker save hello-world > ./test/test-save.tar
+      var data = require('fs').createReadStream('./test/test-load.tar');
+      docker.loadImage(data, {}, handler);
+    });
+  });
+
   describe("#getEvents", function() {
     it("should get events", function(done) {
       this.timeout(30000);
diff --git a/test/test-load.tar b/test/test-load.tar
new file mode 100644
index 0000000000000000000000000000000000000000..0d0509bc20712be5e276b790da2dcaa275ef7305
GIT binary patch
literal 13824
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

literal 0
HcmV?d00001