From db1801beea8279c6f76697eddca1cff8afec7ffb Mon Sep 17 00:00:00 2001 From: Ray Fang Date: Tue, 5 Sep 2017 12:40:56 +0800 Subject: [PATCH] Add other types supported by NodeJS TLS API --- types/dockerode/dockerode-tests.ts | 21 +++++++++++++++++++-- types/dockerode/index.d.ts | 6 +++--- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/types/dockerode/dockerode-tests.ts b/types/dockerode/dockerode-tests.ts index 97e8904f91..458134917b 100644 --- a/types/dockerode/dockerode-tests.ts +++ b/types/dockerode/dockerode-tests.ts @@ -9,6 +9,23 @@ const docker3 = new Docker({ protocol: 'http', host: '127.0.0.1', port: 3000 }); const docker4 = new Docker({ host: '127.0.0.1', port: 3000 }); const docker5 = new Docker({ + host: '192.168.1.10', + port: process.env.DOCKER_PORT || 2375, + ca: 'ca', + cert: 'cert', + key: 'key' +}); + +const docker6 = new Docker({ + protocol: 'https', // you can enforce a protocol + host: '192.168.1.10', + port: process.env.DOCKER_PORT || 2375, + ca: 'ca', + cert: 'cert', + key: 'key' +}); + +const docker7 = new Docker({ host: '192.168.1.10', port: process.env.DOCKER_PORT || 2375, ca: fs.readFileSync('ca.pem'), @@ -17,7 +34,7 @@ const docker5 = new Docker({ version: 'v1.25' // required when Docker >= v1.13, https://docs.docker.com/engine/api/version-history/ }); -const docker6 = new Docker({ +const docker8 = new Docker({ protocol: 'https', // you can enforce a protocol host: '192.168.1.10', port: process.env.DOCKER_PORT || 2375, @@ -26,7 +43,7 @@ const docker6 = new Docker({ key: fs.readFileSync('key.pem') }); -const docker7 = new Docker({ +const docker9 = new Docker({ Promise }); diff --git a/types/dockerode/index.d.ts b/types/dockerode/index.d.ts index 3796a160b6..9430a1c99d 100644 --- a/types/dockerode/index.d.ts +++ b/types/dockerode/index.d.ts @@ -659,9 +659,9 @@ declare namespace Dockerode { socketPath?: string; host?: string; port?: number | string; - ca?: Buffer; - cert?: Buffer; - key?: Buffer; + ca?: string | string[] | Buffer | Buffer[]; + cert?: string | string[] | Buffer | Buffer[]; + key?: string | string[] | Buffer | Buffer[]; protocol?: "https" | "http"; timeout?: number; version?: string;