presidium 0.19.1 → 0.19.3

package/Docker.js

@@ -873,10 +873,12 @@ Docker.prototype.createService = function dockerCreateService(service, options)
         },
       },
 
-      // TODO options.mode global
-      Mode: {
+      Mode: options.replicas == 'global' ? {
+        Global: {},
+      } : {
         Replicated: { Replicas: options.replicas ?? 1 }
       },
+
       UpdateConfig: fork({
         Parallelism: get('updateParallelism', 2),
         Delay: get('updateDelay', 1e9),

package/Docker.test.js

@@ -373,7 +373,7 @@ EXPOSE 8888`,
     { // create another service
       const response = await docker.createService('hey2', {
         image: 'node:15-alpine',
-        replicas: 2,
+        replicas: 'global',
         cmd: ['node', '-e', 'http.createServer((request, response) => response.end(\'hey2\')).listen(3001)'],
         workdir: '/opt/heyo',
         env: { HEY: 'hey' },
@@ -401,7 +401,7 @@ EXPOSE 8888`,
     { // listTasks
       const response = await docker.listTasks()
       const body = await response.json()
-      assert.equal(body.length, 4) // 2 for hey1, 2 for hey2
+      assert.equal(body.length, 3) // 2 for hey1, 1 for hey2 (global)
     }
 
     { // inspectService

package/DockerService.js

@@ -47,7 +47,7 @@ const dockerServiceOptions = [
  * new DockerService({
  *   name: string,
  *   image: string,
- *   replicas: 1|number,
+ *   replicas: 'global'|1|number,
  *   restart: 'no'|'on-failure[:<max-retries>]'|'any',
  *   restartDelay: 10e9|number, // nanoseconds to delay between restarts
  *   logDriver: 'json-file'|'syslog'|'journald'|'gelf'|'fluentd'|'awslogs'|'splunk'|'none',
@@ -141,11 +141,6 @@ DockerService.prototype.deploy = async function deploy() {
 
   // service exists
   if (inspectServiceResponse.ok) {
-    const serviceData = await inspectServiceResponse.json()
-    const deployedImage = serviceData.Spec.TaskTemplate.ContainerSpec.Image
-    if (this.image == deployedImage) {
-      return { message: 'noop' }
-    }
     await this.update(this.serviceOptions)
     return { message: 'success' }
   }
@@ -179,7 +174,7 @@ DockerService.prototype.synchronize = function dockerServiceSynchronize() {
  *   rollback: 'previous', // roll service back to previous version
  *
  *   image: string,
- *   replicas: 1|number,
+ *   replicas: 'global'|number,
  *   restart: 'no'|'on-failure[:<max-retries>]'|'any',
  *   restartDelay: 10e9|number, // nanoseconds to delay between restarts
  *   logDriver: 'json-file'|'syslog'|'journald'|'gelf'|'fluentd'|'awslogs'|'splunk'|'none',

package/DockerService.test.js

@@ -106,16 +106,16 @@ const test = new Test('DockerService', DockerService)
     await new Promise(resolve => logResponseStream.on('end', resolve))
   }
 
-  // further deploys should noop
+  // further deploys should update
   {
     const { message } = await myService.deploy()
-    assert.equal(message, 'noop')
+    assert.equal(message, 'success')
   }
 
   // further deploys should noop
   {
     const { message } = await myService.deploy()
-    assert.equal(message, 'noop')
+    assert.equal(message, 'success')
   }
 
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "presidium",
-  "version": "0.19.1",
+  "version": "0.19.3",
   "description": "A library for creating web services",
   "author": "Richard Tong",
   "license": "MIT",