1.0.50

.gitlab-ci.yml

@@ -48,7 +48,7 @@ testLTS:
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
   - docker
-  - notpriv
+  - priv
 
 testBuild:
   stage: test

package-lock.json

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

package.json

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

test/test.ts

@@ -73,7 +73,8 @@ tap.test('should create a service', async () => {
       'testlabel': 'hi'
     },
     Name: 'testService',
-    networks: [testNetwork]
+    networks: [testNetwork],
+    networkAlias: 'testService'
   });
 });
 

ts/docker.classes.host.ts

@@ -12,8 +12,16 @@ export class DockerHost {
    * the constructor to instantiate a new docker sock instance
    * @param pathArg
    */
-  constructor(pathArg: string = 'http://unix:/var/run/docker.sock:') {
-    this.socketPath = pathArg;
+  constructor(pathArg?: string) {
+    let pathToUse: string;
+    if (pathArg) {
+      pathToUse = pathArg;
+    } else if (process.env.CI) {
+      pathToUse = 'http://docker:2375/';
+    } else {
+      pathToUse = 'http://unix:/var/run/docker.sock:';
+    }
+    this.socketPath = pathToUse;
   }
 
   /**

ts/docker.classes.image.ts

@@ -112,14 +112,6 @@ export class DockerImage {
     });
   }
 
-  /**
-   * returns a boolean wether the image has a upstream image
-   */
-  public isUpstreamImage(): boolean {
-    // TODO: implement isUpastreamImage
-    return this.RepoTags.length > 0;
-  }
-
   public tagImage(newTag) {}
 
   /**

ts/docker.classes.service.ts

@@ -32,7 +32,7 @@ export class DockerService {
     for (const network of serviceCreationDescriptor.networks) {
       networkArray.push({
         Target: network.Name,
-        Aliases: []
+        Aliases: [serviceCreationDescriptor.networkAlias]
       });
     }
 
@@ -56,4 +56,8 @@ export class DockerService {
     this.dockerHost = dockerHostArg;
     Object.assign(this, serviceObject);
   }
+
+  update() {
+    // TODO: implemnt updating service
+  }
 }

ts/interfaces/service.ts

@@ -6,4 +6,5 @@ export interface IServiceCreationDescriptor {
   Image: string;
   Labels: interfaces.TLabels;
   networks: DockerNetwork[];
+  networkAlias: string;
 }