Comparing version 2.5.7 to 2.5.8
@@ -34,3 +34,4 @@ var extend = require('./util').extend, | ||
putArchive: {}, | ||
update: {} | ||
update: {}, | ||
wait: {} | ||
}; | ||
@@ -758,6 +759,9 @@ }; | ||
* Waits for a container to end. | ||
* @param {[type]} opts Container wait options, like condition. (optional) | ||
* @param {Function} callback Callback | ||
*/ | ||
Container.prototype.wait = function(callback) { | ||
Container.prototype.wait = function(opts, callback) { | ||
var self = this; | ||
var args = util.processArgs(opts, callback, this.defaultOptions.wait); | ||
var optsf = { | ||
@@ -771,6 +775,7 @@ path: '/containers/' + this.id + '/wait', | ||
500: 'server error' | ||
} | ||
}, | ||
options: args.opts | ||
}; | ||
if(callback === undefined) { | ||
if(args.callback === undefined) { | ||
return new this.modem.Promise(function(resolve, reject) { | ||
@@ -786,3 +791,3 @@ self.modem.dial(optsf, function(err, data) { | ||
this.modem.dial(optsf, function(err, data) { | ||
callback(err, data); | ||
args.callback(err, data); | ||
}); | ||
@@ -789,0 +794,0 @@ } |
@@ -1172,2 +1172,3 @@ var EventEmitter = require('events').EventEmitter, | ||
options: opts, | ||
authconfig: opts.authconfig, | ||
statusCodes: { | ||
@@ -1174,0 +1175,0 @@ 200: true, |
{ | ||
"name": "dockerode", | ||
"description": "Docker Remote API module.", | ||
"version": "2.5.7", | ||
"version": "2.5.8", | ||
"author": "Pedro Dias <petermdias@gmail.com>", | ||
@@ -19,7 +19,7 @@ "maintainers": [ | ||
"concat-stream": "~1.6.2", | ||
"docker-modem": "1.0.x", | ||
"docker-modem": "^1.0.8", | ||
"tar-fs": "~1.16.3" | ||
}, | ||
"devDependencies": { | ||
"bluebird": "^3.5.2", | ||
"bluebird": "^3.5.3", | ||
"chai": "~4.1.0", | ||
@@ -26,0 +26,0 @@ "memorystream": "~0.3.0", |
@@ -145,3 +145,3 @@ # dockerode [![Build Status](https://travis-ci.org/apocas/dockerode.svg?branch=master)](https://travis-ci.org/apocas/dockerode) | ||
``` | ||
``` js | ||
let dockerode = new Dockerode(); | ||
@@ -417,3 +417,3 @@ let stream = await dockerode.buildImage(...); | ||
- container.attach(options) - [Docker API Endpoint](https://docs.docker.com/engine/api/v1.37/#operation/ContainerAttach) | ||
- container.wait() - [Docker API Endpoint](https://docs.docker.com/engine/api/v1.37/#operation/ContainerWait) | ||
- container.wait(options) - [Docker API Endpoint](https://docs.docker.com/engine/api/v1.37/#operation/ContainerWait) | ||
- container.remove(options) - [Docker API Endpoint](https://docs.docker.com/engine/api/v1.37/#operation/ContainerDelete) | ||
@@ -420,0 +420,0 @@ - container.getArchive(options) - [Docker API Endpoint](https://docs.docker.com/engine/api/v1.37/#operation/ContainerArchive) |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
189945
4121
Updateddocker-modem@^1.0.8