From a5a806bcff0989e5f5a96bc59993b008a8b07651 Mon Sep 17 00:00:00 2001 From: Geoff Rich Date: Thu, 28 Jun 2018 07:37:14 +1000 Subject: [PATCH 1/2] Add array of streams option to run command. --- types/dockerode/index.d.ts | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/types/dockerode/index.d.ts b/types/dockerode/index.d.ts index 188643dc28..3bbfa4e649 100644 --- a/types/dockerode/index.d.ts +++ b/types/dockerode/index.d.ts @@ -11,7 +11,6 @@ /// -import * as stream from 'stream'; import * as events from 'events'; declare namespace Dockerode { @@ -962,11 +961,11 @@ declare class Dockerode { pull(repoTag: string, options: {}, callback: Callback, auth?: {}): Dockerode.Image; pull(repoTag: string, options: {}, auth?: {}): Promise; - run(image: string, cmd: string[], outputStream: NodeJS.WritableStream, createOptions: {}, startOptions: {}, callback: Callback): events.EventEmitter; - run(image: string, cmd: string[], outputStream: NodeJS.WritableStream, startOptions: {}, callback: Callback): events.EventEmitter; - run(image: string, cmd: string[], outputStream: NodeJS.WritableStream, callback: Callback): events.EventEmitter; - run(image: string, cmd: string[], outputStream: NodeJS.WritableStream, createOptions: {}, callback: Callback): events.EventEmitter; - run(image: string, cmd: string[], outputStream: NodeJS.WritableStream, createOptions?: {}, startOptions?: {}): Promise; + run(image: string, cmd: string[], outputStream: NodeJS.WritableStream | NodeJS.WritableStream[], createOptions: {}, startOptions: {}, callback: Callback): events.EventEmitter; + run(image: string, cmd: string[], outputStream: NodeJS.WritableStream | NodeJS.WritableStream[], startOptions: {}, callback: Callback): events.EventEmitter; + run(image: string, cmd: string[], outputStream: NodeJS.WritableStream | NodeJS.WritableStream[], callback: Callback): events.EventEmitter; + run(image: string, cmd: string[], outputStream: NodeJS.WritableStream | NodeJS.WritableStream[], createOptions: {}, callback: Callback): events.EventEmitter; + run(image: string, cmd: string[], outputStream: NodeJS.WritableStream | NodeJS.WritableStream[], createOptions?: {}, startOptions?: {}): Promise; swarmInit(options: {}, callback: Callback): void; swarmInit(options: {}): Promise; From 5fc1e8a77b4fb70a8fae846fa1c0cdb34c41395d Mon Sep 17 00:00:00 2001 From: Geoff Rich Date: Thu, 28 Jun 2018 07:40:22 +1000 Subject: [PATCH 2/2] Re-add import back in. --- types/dockerode/index.d.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/types/dockerode/index.d.ts b/types/dockerode/index.d.ts index 3bbfa4e649..5c1c1bfae6 100644 --- a/types/dockerode/index.d.ts +++ b/types/dockerode/index.d.ts @@ -11,6 +11,7 @@ /// +import * as stream from 'stream'; import * as events from 'events'; declare namespace Dockerode {