1.0.86

.snyk

@@ -0,0 +1,9 @@
+# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
+version: v1.13.5
+# ignores vulnerabilities until expiry date; change duration by modifying expiry date
+ignore:
+  SNYK-JS-HTTPSPROXYAGENT-469131:
+    - '@pushrocks/smartnetwork > speedtest-net > https-proxy-agent':
+        reason: None given
+        expires: '2019-11-04T13:59:28.695Z'
+patch: {}

package-lock.json

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

package.json

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

ts/docker.classes.image.ts

@@ -140,7 +140,7 @@ export class DockerImage {
     if (this.Labels && this.Labels.version) {
       return this.Labels.version;
     } else {
-      return 'x.x.x';
+      return '0.0.0';
     }
   }
 }

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[]> {
@@ -29,17 +30,17 @@ export class DockerNetwork {
       CheckDuplicate: true,
       Driver: 'overlay',
       EnableIPv6: false,
-      IPAM: {
+      /* IPAM: {
         Driver: 'default',
         Config: [
           {
-            Subnet: '172.20.10.0/16',
-            IPRange: '172.20.10.0/24',
-            Gateway: '172.20.10.11'
+            Subnet: `172.20.${networkCreationDescriptor.NetworkNumber}.0/16`,
+            IPRange: `172.20.${networkCreationDescriptor.NetworkNumber}.0/24`,
+            Gateway: `172.20.${networkCreationDescriptor.NetworkNumber}.11`
           }
         ]
-      },
-      Internal: true,
+      }, */
+      Internal: false,
       Attachable: true,
       Ingress: false
     });
@@ -91,16 +92,28 @@ export class DockerNetwork {
     const response = await this.dockerHost.request('DELETE', `/networks/${this.Id}`);
   }
 
-  public async getContainersOnNetwork(): Promise<{
-    [key: string]: {
+  public async getContainersOnNetwork(): Promise<Array<{
       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

@@ -129,6 +129,9 @@ export class DockerService {
           Labels: labels,
           Secrets: secretArray,
           Mounts: mounts
+          /* DNSConfig: {
+            Nameservers: ['1.1.1.1']
+          } */
         },
         UpdateConfig: {
           Parallelism: 0,
@@ -140,6 +143,13 @@ export class DockerService {
         ForceUpdate: 1,
         Resources: {
           Limits: limits
+        },
+        LogDriver: {
+          Name: 'json-file',
+          Options: {
+            'max-file': '3',
+            'max-size': '10M'
+          }
         }
       },
       Labels: labels,