1.0.81

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojoio/docker",
-  "version": "1.0.75",
+  "version": "1.0.81",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojoio/docker",
-  "version": "1.0.75",
+  "version": "1.0.81",
   "description": "easy communication with docker remote api from node, TypeScript ready",
   "private": false,
   "main": "dist/index.js",

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',

ts/docker.classes.network.ts

@@ -2,6 +2,7 @@ import * as plugins from './docker.plugins';
 import * as interfaces from './interfaces';
 
 import { DockerHost } from './docker.classes.host';
+import { DockerService } from './docker.classes.service';
 
 export class DockerNetwork {
   public static async getNetworks(dockerHost: DockerHost): Promise<DockerNetwork[]> {
@@ -28,14 +29,14 @@ export class DockerNetwork {
       Name: networkCreationDescriptor.Name,
       CheckDuplicate: true,
       Driver: 'overlay',
-      EnableIPv6: false,
+      EnableIPv6: true,
       IPAM: {
         Driver: 'default',
         Config: [
           {
-            Subnet: '172.20.10.0/16',
+            Subnet: `172.20.${networkCreationDescriptor.NetworkNumber}.0/16`,
-            IPRange: '172.20.10.0/24',
+            IPRange: `172.20.${networkCreationDescriptor.NetworkNumber}.0/24`,
-            Gateway: '172.20.10.11'
+            Gateway: `172.20.${networkCreationDescriptor.NetworkNumber}.11`
           }
         ]
       },
@@ -91,16 +92,28 @@ export class DockerNetwork {
     const response = await this.dockerHost.request('DELETE', `/networks/${this.Id}`);
   }
 
-  public async getContainersOnNetwork(): Promise<{
+  public async getContainersOnNetwork(): Promise<Array<{
-    [key: string]: {
       Name: string;
       EndpointID: string;
       MacAddress: string;
       IPv4Address: string;
       IPv6Address: string;
-    };
+    }>> {
-  }> {
+    const returnArray = [];
     const response = await this.dockerHost.request('GET', `/networks/${this.Id}`);
-    return response.body.Containers;
+    for (const key of Object.keys(response.body.Containers)) {
+      returnArray.push(response.body.Containers[key]);
+    }
+
+    return returnArray;
+
+  }
+
+  public async getContainersOnNetworkForService(serviceArg: DockerService) {
+    const containersOnNetwork = await this.getContainersOnNetwork();
+    const containersOfService = containersOnNetwork.filter(container => {
+      return container.Name.startsWith(serviceArg.Spec.Name);
+    });
+    return containersOfService;
   }
 }

ts/docker.classes.service.ts

@@ -128,7 +128,10 @@ export class DockerService {
           Image: serviceCreationDescriptor.image.RepoTags[0],
           Labels: labels,
           Secrets: secretArray,
-          Mounts: mounts
+          Mounts: mounts,
+          DNSConfig: {
+            Nameservers: ['1.1.1.1']
+          }
         },
         UpdateConfig: {
           Parallelism: 0,

ts/interfaces/network.ts

@@ -3,4 +3,5 @@
  */
 export interface INetworkCreationDescriptor {
   Name: string;
+  NetworkNumber: number;
 }