1.0.61

package-lock.json

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

package.json

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

test/test.ts

@@ -1,6 +1,5 @@
 import { expect, tap } from '@pushrocks/tapbundle';
 import * as docker from '../ts/index';
-import { DockerService } from '../ts/index';
 
 let testDockerHost: docker.DockerHost;
 
@@ -61,6 +60,7 @@ tap.test('should return a change Observable', async tools => {
 tap.test('should create a secret', async () => {
   const mySecret = await docker.DockerSecret.createSecret(testDockerHost, {
     name: 'testSecret',
+    version: '1.0.3',
     contentArg: `{ "hi": "wow"}`,
     labels: {}
   });
@@ -89,15 +89,19 @@ tap.test('should create a service', async () => {
   });
   const testSecret = await docker.DockerSecret.createSecret(testDockerHost, {
     name: 'serviceSecret',
+    version: '0.0.1',
     labels: {},
     contentArg: '{"hi": "wow"}'
   });
-  const testService = await DockerService.createService(testDockerHost, {
+  const testImage = await docker.DockerImage.createFromRegistry(testDockerHost, {
-    Image: 'nginx:latest',
+    imageUrl: 'nginx:latest'
-    Labels: {    
+  });
+  const testService = await docker.DockerService.createService(testDockerHost, {
+    image: testImage,
+    labels: {    
       'testlabel': 'hi'
     },
-    Name: 'testService',
+    name: 'testService',
     networks: [testNetwork],
     networkAlias: 'testService',
     secrets: [testSecret]

ts/docker.classes.host.ts

@@ -8,6 +8,7 @@ export class DockerHost {
    * the path where the docker sock can be found
    */
   public socketPath: string;
+  private registryToken: string = '';
 
   /**
    * the constructor to instantiate a new docker sock instance
@@ -34,8 +35,18 @@ export class DockerHost {
     const response = await this.request('POST', '/auth', {
       serveraddress: registryUrl,
       username: userArg,
-      password: passArg,
+      password: passArg
     });
+    if (response.body.Status !== 'Login Succeeded') {
+      console.log(`Login failed with ${response.body.Status}`);
+      throw new Error(response.body.Status);
+    }
+    console.log(response.body.Status);
+    this.registryToken = plugins.smartstring.base64.encode(response.body.IdentityToken);
+  }
+
+  public setAuthToken(authToken: string) {
+    this.registryToken = authToken;
   }
 
   /**
@@ -122,6 +133,7 @@ export class DockerHost {
       method: methodArg,
       headers: {
         'Content-Type': 'application/json',
+        'X-Registry-Auth': this.registryToken,
         Host: 'docker.sock'
       },
       requestBody: dataArg,

ts/docker.classes.image.ts

@@ -15,9 +15,15 @@ export class DockerImage {
 
   public static async findImageByName(dockerHost: DockerHost, imageNameArg: string) {
     const images = await this.getImages(dockerHost);
-    return images.find(image => {
+    const result = images.find(image => {
-      return image.RepoTags.includes(imageNameArg);
+      if (image.RepoTags) {
+        return image.RepoTags.includes(imageNameArg);
+      } else {
+        return false;
+      }
+      
     });
+    return result;
   }
 
   public static async createFromRegistry(
@@ -113,7 +119,13 @@ export class DockerImage {
     });
   }
 
-  public tagImage(newTag) {}
+  /**
+   * tag an image
+   * @param newTag
+   */
+  public async tagImage(newTag) {
+    throw new Error('.tagImage is not yet implemented');
+  }
 
   /**
    * pulls the latest version from the registry
@@ -126,4 +138,9 @@ export class DockerImage {
     // TODO: Compare image digists before and after
     return true;
   }
+
+  // get stuff
+  public async getVersion() {
+    return this.Labels.version;
+  }
 }

ts/docker.classes.secret.ts

@@ -28,9 +28,13 @@ export class DockerSecret {
   }
 
   public static async createSecret(dockerHostArg: DockerHost, secretDescriptor: interfaces.ISecretCreationDescriptor) {
+    const labels: interfaces.TLabels = {
+      ...secretDescriptor.labels,
+      version: secretDescriptor.version
+    };
     const response = await dockerHostArg.request('POST', '/secrets/create', {
       Name: secretDescriptor.name,
-      Labels: secretDescriptor.labels,
+      Labels: labels,
       Data: plugins.smartstring.base64.encode(secretDescriptor.contentArg)
     });
     
@@ -46,9 +50,9 @@ export class DockerSecret {
     Name: string;
     Labels: interfaces.TLabels;
   };
-  Version: {
+  public Version: {
     Index:string;
-  }
+  };
 
   public dockerHost: DockerHost;
   constructor(dockerHostArg: DockerHost) {
@@ -70,4 +74,10 @@ export class DockerSecret {
   public async remove () {
     await this.dockerHost.request('DELETE', `/secrets/${this.ID}`);
   }
+
+
+  // get things
+  public async getVersion() {
+    return this.Spec.Labels.version;
+  }
 }

ts/docker.classes.service.ts

@@ -39,14 +39,16 @@ export class DockerService {
     // lets get the image
     plugins.smartlog.defaultLogger.log(
       'info',
-      `downloading image for service ${serviceCreationDescriptor.Name}`
+      `now creating service ${serviceCreationDescriptor.name}`
     );
-    const serviceImage = await DockerImage.createFromRegistry(dockerHost, {
+    
-      imageUrl: serviceCreationDescriptor.Image
+    // await serviceCreationDescriptor.image.pullLatestImageFromRegistry();
-    });
+    const serviceVersion = await serviceCreationDescriptor.image.getVersion();
 
-    const serviceVersion = serviceImage.Labels.version;
+    const labels: interfaces.TLabels = {
-    serviceCreationDescriptor.Labels.version = serviceVersion;
+      ...serviceCreationDescriptor.labels,
+      version: serviceVersion
+    };
 
     const networkArray: any[] = [];
     for (const network of serviceCreationDescriptor.networks) {
@@ -71,11 +73,11 @@ export class DockerService {
     }
 
     const response = await dockerHost.request('POST', '/services/create', {
-      Name: serviceCreationDescriptor.Name,
+      Name: serviceCreationDescriptor.name,
       TaskTemplate: {
         ContainerSpec: {
-          Image: serviceCreationDescriptor.Image,
+          Image: serviceCreationDescriptor.image.RepoTags[0],
-          Labels: serviceCreationDescriptor.Labels,
+          Labels: labels,
           Secrets: secretArray
         },
         UpdateConfig: {
@@ -87,13 +89,13 @@ export class DockerService {
         },
         ForceUpdate: 1
       },
-      Labels: serviceCreationDescriptor.Labels,
+      Labels: serviceCreationDescriptor.labels,
       Networks: networkArray
     });
 
     const createdService = await DockerService.getServiceByName(
       dockerHost,
-      serviceCreationDescriptor.Name
+      serviceCreationDescriptor.name
     );
     return createdService;
   }
@@ -107,7 +109,7 @@ export class DockerService {
   public UpdatedAt: string;
   public Spec: {
     Name: string;
-    Labels: interfaces.TLabels; // ZBD
+    Labels: interfaces.TLabels;
     TaskTemplate: {
       ContainerSpec: {
         Image: string;
@@ -142,7 +144,7 @@ export class DockerService {
 
     const dockerData = await this.dockerHostRef.request(
       'POST',
-      `/services/${this.ID}/update?version=${this.Version.Index + 1}`,
+      `/services/${this.ID}/update?version=${this.Version.Index}`,
       {
         Name: this.Spec.Name,
         TaskTemplate: this.Spec.TaskTemplate,
@@ -162,7 +164,7 @@ export class DockerService {
     Object.assign(this, dockerData);
   }
 
-  public async updateFromRegistry() {
+  public async needsUpdate(): Promise<boolean> {
     // TODO: implement digest based update recognition
 
     await this.reReadFromDockerEngine();
@@ -173,7 +175,15 @@ export class DockerService {
     const imageVersion = new plugins.smartversion.SmartVersion(dockerImage.Labels.version);
     const serviceVersion = new plugins.smartversion.SmartVersion(this.Spec.Labels.version);
     if (imageVersion.greaterThan(serviceVersion)) {
-      console.log('service needs to be updated');
+      console.log(`service ${this.Spec.Name}  needs to be updated`);
+      return true;
+    } else {
+      console.log(`service ${this.Spec.Name} is up to date.`);
+    }
+  }
+
+  public async updateFromRegistry() {
+    if (await this.needsUpdate()) {
       this.update();
     }
   }

ts/interfaces/secret.ts

@@ -2,6 +2,7 @@ import * as interfaces from './';
 
 export interface ISecretCreationDescriptor {
   name: string;
+  version: string;
   contentArg: any;
   labels: interfaces.TLabels;
 }

ts/interfaces/service.ts

@@ -1,11 +1,12 @@
 import * as interfaces from './';
 import { DockerNetwork } from '../docker.classes.network';
 import { DockerSecret } from '../docker.classes.secret';
+import { DockerImage } from '../docker.classes.image';
 
 export interface IServiceCreationDescriptor {
-  Name: string;
+  name: string;
-  Image: string;
+  image: DockerImage;
-  Labels: interfaces.TLabels;
+  labels: interfaces.TLabels;
   networks: DockerNetwork[];
   networkAlias: string;
   secrets: DockerSecret[];