From 71c89ac9bce1cb2966b7af41bf7b748dd31e5b1c Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Sun, 22 Sep 2019 23:42:29 +0200 Subject: [PATCH] fix(core): update --- test/test.ts | 6 ++++-- ts/docker.classes.network.ts | 12 +++++++++++- ts/interfaces/network.ts | 1 + 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/test/test.ts b/test/test.ts index 30ec99d..d93e651 100644 --- a/test/test.ts +++ b/test/test.ts @@ -26,7 +26,8 @@ tap.test('should list networks', async () => { tap.test('should create a network', async () => { const newNetwork = await docker.DockerNetwork.createNetwork(testDockerHost, { - Name: 'webgateway' + Name: 'webgateway', + NetworkNumber: 10 }); expect(newNetwork).to.be.instanceOf(docker.DockerNetwork); expect(newNetwork.Name).to.equal('webgateway'); @@ -84,7 +85,8 @@ tap.test('should list all services', async tools => { tap.test('should create a service', async () => { const testNetwork = await docker.DockerNetwork.createNetwork(testDockerHost, { - Name: 'testNetwork' + Name: 'testNetwork', + NetworkNumber: 11 }); const testSecret = await docker.DockerSecret.createSecret(testDockerHost, { name: 'testSecret', diff --git a/ts/docker.classes.network.ts b/ts/docker.classes.network.ts index a4b6ab5..43b31ed 100644 --- a/ts/docker.classes.network.ts +++ b/ts/docker.classes.network.ts @@ -29,7 +29,17 @@ export class DockerNetwork { Name: networkCreationDescriptor.Name, CheckDuplicate: true, Driver: 'overlay', - EnableIPv6: false, + EnableIPv6: true, + IPAM: { + Driver: 'default', + Config: [ + { + Subnet: `172.20.${networkCreationDescriptor.NetworkNumber}.0/16`, + IPRange: `172.20.${networkCreationDescriptor.NetworkNumber}.0/24`, + Gateway: `172.20.${networkCreationDescriptor.NetworkNumber}.11` + } + ] + }, Internal: true, Attachable: true, Ingress: false diff --git a/ts/interfaces/network.ts b/ts/interfaces/network.ts index e3c4515..b46b9d6 100644 --- a/ts/interfaces/network.ts +++ b/ts/interfaces/network.ts @@ -3,4 +3,5 @@ */ export interface INetworkCreationDescriptor { Name: string; + NetworkNumber: number; }