Merge pull request #189 from lmoran/master

Added authorization to "pull"
apocas · Nov 26, 2015 · 6cba150 · 6cba150
2 parents a91c1f0 + b1cb3eb
commit 6cba150
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
 .vagrant
 node_modules
 npm-debug.log
-docker-modem/
diff --git a/lib/docker.js b/lib/docker.js
@@ -464,16 +464,17 @@ Docker.prototype.getEvents = function(opts, callback) {
  * @param  {String}   repoTag  Repository tag
  * @param  {Object}   opts     Options (optional)
  * @param  {Function} callback Callback
+ * @param  {Object}   auth     Authentication (optional)
  * @return {Object}            Image
  */
-Docker.prototype.pull = function(repoTag, opts, callback) {
+Docker.prototype.pull = function(repoTag, opts, callback, auth) {
   var args = util.processArgs(opts, callback);
 
   var imageSrc = util.parseRepositoryTag(repoTag);
   args.opts.fromImage = imageSrc.repository;
   args.opts.tag = imageSrc.tag;
 
-  var argsf = [args.opts, args.callback];
+  var argsf = [auth, args.opts, args.callback]; 
   return this.createImage.apply(this, argsf);
 };