presidium 0.16.2 → 0.16.3

package/Docker.js

@@ -16,6 +16,7 @@ const join = require('./internal/join')
 const isArray = require('./internal/isArray')
 const pathJoin = require('./internal/pathJoin')
 const has = require('./internal/has')
+const filterExists = require('./internal/filterExists')
 
 const {
   pipe, tap,
@@ -776,6 +777,8 @@ Docker.prototype.updateSwarm = async function dockerUpdateSwarm(options = {}) {
  *   rollbackMonitor: 15e9|number, // ns after each task rollback to monitor for failure
  *   rollbackMaxFailureRatio: 0.15|number, // failure rate to tolerate during a rollback
  *
+ *   network?: string, // name or id of network to attach service
+ *
  *   cmd: Array<string|number>, // CMD
  *   workdir: path string, // WORKDIR
  *   env: {
@@ -874,6 +877,7 @@ Docker.prototype.createService = function dockerCreateService(service, options)
         Monitor: get('updateMonitor', 15e9),
         MaxFailureRatio: get('updateMaxFailureRatio', 0.15),
       })(options),
+
       RollbackConfig: fork({
         Parallelism: get('rollbackParallelism', 1),
         Delay: get('rollbackDelay', 1e9),
@@ -882,6 +886,14 @@ Docker.prototype.createService = function dockerCreateService(service, options)
         MaxFailureRatio: get('rollbackMaxFailureRatio', 0.15),
       })(options),
 
+      ...options.network && {
+        Networks: [{
+          Target: options.network,
+          Aliases: [],
+          DriverOpts: {},
+        }],
+      },
+
       ...options.publish && {
         EndpointSpec: {
           Ports: Object.entries(options.publish).map(pipe([
@@ -1233,6 +1245,18 @@ Docker.prototype.listNodes = async function listNodes() {
   return this.http.get('/nodes')
 }
 
+/**
+ * @name Docker.prototype.deleteNode
+ *
+ * @synopsis
+ * ```coffeescript [specscript]
+ * new Docker().deleteNode(id string) -> Promise<HttpResponse>
+ * ```
+ */
+Docker.prototype.deleteNode = function deleteNode(id) {
+  return this.http.delete(`/nodes/${id}`)
+}
+
 /**
  * @name Docker.prototype.pruneImages
  *
@@ -1269,6 +1293,30 @@ Docker.prototype.pruneVolumes = function dockerPruneVolumes() {
   return this.http.post('/volumes/prune')
 }
 
+/**
+ * @name Docker.prototype.createNetwork
+ *
+ * @synopsis
+ * ```coffeescript [specscript]
+ * new Docker().createNetwork(options {
+ *   name: string, // name of the network
+ *   driver?: 'bridge'|'host'|'overlay'|'ipvlan'|'macvlan', // default 'bridge'
+ * }) -> Promise<HttpResponse>
+ * ```
+ */
+Docker.prototype.createNetwork = function createNetwork(options) {
+  return this.http.post('/networks/create', {
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    body: JSON.stringify(filterExists({
+      Name: options.name,
+      Driver: options.driver,
+      CheckDuplicate: true,
+    })),
+  })
+}
+
 /**
  * @name Docker.prototype.pruneNetworks
  *

package/Docker.test.js

@@ -284,6 +284,13 @@ EXPOSE 8888`,
       assert.equal(response.status, 200)
       const nodes = await response.json()
       assert.equal(nodes.length, 1) // just this computer
+      this.nodeId = nodes[0].ID
+    }
+
+    { // attempt deleteNode
+      const response = await docker.deleteNode(this.nodeId)
+      assert.equal(response.status, 400)
+      console.log(await response.text())
     }
 
     { // inspectSwarm
@@ -295,6 +302,14 @@ EXPOSE 8888`,
       this.workerJoinToken = body.JoinTokens.Worker
     }
 
+    { // create a network
+      const response = await docker.createNetwork({
+        name: 'my-network',
+        driver: 'overlay',
+      })
+      assert.equal(response.status, 201)
+    }
+
     { // create a service
       const response = await docker.createService('hey1', {
         image: 'node:15-alpine',
@@ -326,6 +341,7 @@ EXPOSE 8888`,
           'max-file': '10',
           'max-size': '100m',
         },
+        network: 'my-network',
       })
       assert.equal(response.status, 201)
       const body = await response.json()

package/DockerService.js

@@ -36,6 +36,7 @@ const dockerServiceOptions = [
   'rollbackParallelism', 'rollbackDelay',
   'rollbackFailureAction', 'rollbackMonitor', 'rollbackMaxFailureRatio',
   'username', 'password', 'email', 'serveraddress', 'identitytoken',
+  'network',
 ]
 
 /**
@@ -75,6 +76,8 @@ const dockerServiceOptions = [
  *   rollbackMonitor: 15e9|number, // ns after each task rollback to monitor for failure
  *   rollbackMaxFailureRatio: 0.15|number, // failure rate to tolerate during a rollback
  *
+ *   network?: string, // name or id of network to attach service
+ *
  *   cmd: Array<string|number>, // CMD
  *   workdir: path string, // WORKDIR
  *   env: {
@@ -108,6 +111,8 @@ const DockerService = function (options) {
   this.docker = new Docker()
   this.version = null
   this.spec = null
+  this.replicas = options.replicas
+
   this.ready = this.docker.inspectService(this.name).then(pipe([
     switchCase([
       eq(404, get('status')),

package/package.json

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