1.0.49

.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.44",
+  "version": "1.0.49",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

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

test/test.ts

@@ -64,12 +64,17 @@ tap.test('should list all services', async tools => {
 });
 
 tap.test('should create a service', async () => {
+  const testNetwork = await docker.DockerNetwork.createNetwork(testDockerHost, {
+    Name: 'testNetwork'
+  });
   await DockerService.createService(testDockerHost, {
-    Image: 'nginx',
+    Image: 'nginx:latest',
     Labels: {    
       'testlabel': 'hi'
     },
-    Name: 'testService'
+    Name: 'testService',
+    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:') {
+  constructor(pathArg?: string) {
-    this.socketPath = pathArg;
+    let pathToUse: string;
+    if (pathArg) {
+      pathToUse = pathArg;
+    } else if (process.env.CI) {
+      pathToUse = 'tcp://docker:2375/';
+    } else {
+      pathToUse = 'http://unix:/var/run/docker.sock:';
+    }
+    this.socketPath = pathToUse;
   }
 
   /**

ts/docker.classes.image.ts

@@ -47,6 +47,8 @@ export class DockerImage {
       } else {
         imageUrlObject.imageTag = imageTag;
       }
+    } else if (!imageUrlObject.imageTag) {
+      imageUrlObject.imageTag = 'latest';
     }
     imageUrlObject.imageOriginTag = `${imageUrlObject.imageUrl}:${imageUrlObject.imageTag}`;
 
@@ -110,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

@@ -23,10 +23,19 @@ export class DockerService {
     serviceCreationDescriptor: interfaces.IServiceCreationDescriptor
   ) {
     // lets get the image
-    DockerImage.createFromRegistry(dockerHost, {
+    plugins.smartlog.defaultLogger.log('info', `downloading image for service ${serviceCreationDescriptor.Name}`);
+    const serviceImage = await DockerImage.createFromRegistry(dockerHost, {
       imageUrl: serviceCreationDescriptor.Image
     });
 
+    const networkArray: any[] = [];
+    for (const network of serviceCreationDescriptor.networks) {
+      networkArray.push({
+        Target: network.Name,
+        Aliases: [serviceCreationDescriptor.networkAlias]
+      });
+    }
+
     dockerHost.request('POST', '/services/create', {
       Name: serviceCreationDescriptor.Name,
       TaskTemplate: {
@@ -35,7 +44,8 @@ export class DockerService {
           Labels: serviceCreationDescriptor.Labels
         }
       },
-      Labels: serviceCreationDescriptor.Labels
+      Labels: serviceCreationDescriptor.Labels,
+      Networks: networkArray
     });
   }
 
@@ -46,4 +56,8 @@ export class DockerService {
     this.dockerHost = dockerHostArg;
     Object.assign(this, serviceObject);
   }
+
+  update() {
+    // TODO: implemnt updating service
+  }
 }

ts/interfaces/service.ts

@@ -1,7 +1,10 @@
 import * as interfaces from './';
+import { DockerNetwork } from '../docker.classes.network';
 
 export interface IServiceCreationDescriptor {
   Name: string;
   Image: string;
   Labels: interfaces.TLabels;
+  networks: DockerNetwork[];
+  networkAlias: string;
 }