presidium 4.5.2 → 4.5.4

package/Docker.js

@@ -1650,6 +1650,7 @@ class Docker {
    *     * `rollbackMonitor` - the amount of time in nanoseconds to monitor each rolled back task for failures. Defaults to `15e9`.
    *     * `rollbackMaxFailureRatio` - the maximum ratio of tasks that may fail during a rollback before the failure action is invoked. Defaults to `0.15`.
    *     * `network` - the network name or ID for attachment.
+   *     * `networks` - the names or IDs of networks for attachment.
    *     * `cmd` - the command that to be run by the Docker service.
    *     * `workdir` - the working directory of the containers of the Docker service.
    *     * `env` - an object of the Docker service's environment variables. Maps environment variable names to environment variable values, e.g. `{ FOO: 'bar' }`.
@@ -1684,7 +1685,7 @@ class Docker {
    *   * [Docker Swarm](https://docs.docker.com/engine/swarm/)
    */
   async createService(service, options = {}) {
-    const body = JSON.stringify({
+    const config = {
       Name: service,
       Labels: options.labels ?? {},
       TaskTemplate: {
@@ -1739,6 +1740,20 @@ class Docker {
           }),
         },
 
+        ...options.networks ? {
+          Networks: options.networks.map(all({
+            Target: __,
+            Aliases: [],
+            DriverOpts: {},
+          }))
+        } : options.network ? {
+          Networks: [{
+            Target: options.network,
+            Aliases: [],
+            DriverOpts: {},
+          }],
+        } : {},
+
         Resources: {
           Reservations: {
             ...options.memory ? {
@@ -1789,14 +1804,6 @@ class Docker {
         MaxFailureRatio: get('rollbackMaxFailureRatio', 0.15),
       })(options),
 
-      ...options.network && {
-        Networks: [{
-          Target: options.network,
-          Aliases: [],
-          DriverOpts: {},
-        }],
-      },
-
       ...options.publish && {
         EndpointSpec: {
           Ports: Object.entries(options.publish).map(pipe([
@@ -1814,10 +1821,10 @@ class Docker {
           ])),
         },
       },
-    })
+    }
 
     const response = await this.http.post('/services/create', {
-      body,
+      body: JSON.stringify(config),
       headers: {
         'Content-Type': 'application/json',
         'X-Registry-Auth': pipe(options, [

package/README.md

@@ -28,6 +28,15 @@ License: [CFOSS](https://cloutsworld.com/en-us/legal/license/cfoss)
 [![codecov](https://codecov.io/gh/richytong/presidium-db/branch/master/graph/badge.svg)](https://codecov.io/gh/richytong/presidium-db)
 [![npm version](https://img.shields.io/npm/v/presidium-db.svg?style=flat)](https://www.npmjs.com/package/presidium-db)
 
+### Presidium DB Client and Server
+
+Source code: [GitHub](https://github.com/richytong/presidium-db-client-server) |
+License: [CFOSS](https://cloutsworld.com/en-us/legal/license/cfoss)
+
+![Node.js CI](https://github.com/richytong/presidium-db-client-server/workflows/Node.js%20CI/badge.svg)
+[![codecov](https://codecov.io/gh/richytong/presidium-db-client-server/graph/badge.svg?token=07P6G8GIOQ)](https://codecov.io/gh/richytong/presidium-db-client-server)
+[![npm version](https://img.shields.io/npm/v/presidium-db-client-server.svg?style=flat)](https://www.npmjs.com/package/presidium-db-client-server)
+
 ## Installation
 with [npm](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm):
 ```bash
@@ -521,5 +530,5 @@ for await (const postJson of postHt.reverseIterator()) {
 ## License
 Presidium is distributed under the [CFOSS License](https://cloutsworld.com/en-us/legal/license/cfoss).
 
-# Support
+## Support
  * minimum Node.js version: 16

package/internal/createUpdateServiceSpec.js

@@ -228,8 +228,14 @@ const createUpdateServiceSpec = function (options) {
     result.RollbackConfig.MaxFailureRatio = options.rollbackMaxFailureRatio
   }
 
-  if (options.network != null) {
-    result.Networks = [{
+  if (options.networks) {
+    result.TaskTemplate.Networks = options.networks.map(all({
+      Target: __,
+      Aliases: [],
+      DriverOpts: {},
+    }))
+  } else if (options.network) {
+    result.TaskTemplate.Networks = [{
       Target: options.network,
       Aliases: [],
       DriverOpts: {},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "presidium",
-  "version": "4.5.2",
+  "version": "4.5.4",
   "description": "The Presidium library.",
   "author": "Richard Tong",
   "license": "CFOSS",
@@ -64,9 +64,10 @@
   "dependencies": {
     "adm-zip": "^0.6.1",
     "html-entities": "^2.6.0",
-    "presidium-db": ">=3.10.0",
-    "presidium-websocket": ">=3.2.1",
-    "rubico": "^2.7.7",
+    "presidium-db": "^4.6.2",
+    "presidium-db-client-server": "^0.3.1",
+    "presidium-websocket": "^4.2.2",
+    "rubico": "^2.21.0",
     "uniqid": "^5.4.0"
   },
   "scripts": {