presidium 0.19.3 → 0.19.5

package/Docker.js

@@ -336,6 +336,7 @@ Docker.prototype.removeImage = function dockerRemoveImage(image, options) {
  *   healthRetries: 5|number, // number of retries before unhealhty
  *   healthStartPeriod: >=1e6, // nanoseconds to wait on container init before starting first healthcheck
  *   memory: number, // memory limit in bytes
+ *   cpus: number, // number of cpus
  *   mounts: Array<{
  *     source: string, // name of volume
  *     target: string, // mounted path inside container
@@ -762,6 +763,8 @@ Docker.prototype.updateSwarm = async function dockerUpdateSwarm(options = {}) {
  *   healthTimeout: 20e9|>1e6, // nanoseconds to wait before healthcheck fails
  *   healthRetries: 5|number, // number of retries before unhealhty
  *   healthStartPeriod: >=1e6, // nanoseconds to wait on container init before starting first healthcheck
+ *   memory: number, // memory limit in bytes
+ *   cpus: number, // number of cpus
  *   mounts: Array<{
  *     source: string, // name of volume
  *     target: string, // mounted path inside container
@@ -860,11 +863,18 @@ Docker.prototype.createService = function dockerCreateService(service, options)
             MaxAttempts: pipe([get(1, 10), Number]),
           })(options.restart.split(':')),
         },
-        ...options.memory && {
-          Resources: {
-            Limits: { MemoryBytes: Number(options.memory) }, // bytes
-          },
+
+        Resources: {
+          Reservations: {
+            ...options.memory ? {
+              MemoryBytes: Number(options.memory),
+            } : {},
+            ...options.cpus ? {
+              NanoCPUs: Number(options.cpus * 1e9),
+            } : {},
+          }, // bytes
         },
+
         ...options.logDriver && {
           LogDriver: {
             Name: options.logDriver,
@@ -979,6 +989,8 @@ const has = property => value => {
  *   healthTimeout: 20e9|>1e6, // nanoseconds to wait before healthcheck fails
  *   healthRetries: 5|number, // number of retries before unhealhty
  *   healthStartPeriod: >=1e6, // nanoseconds to wait on container init before starting first healthcheck
+ *   memory: number, // memory limit in bytes
+ *   cpus: number, // number of cpus
  *   mounts: Array<{
  *     source: string, // name of volume
  *     target: string, // mounted path inside container
@@ -1074,10 +1086,15 @@ Docker.prototype.updateService = function dockerUpdateService(service, options)
             ...options.restartDelay && { Delay: Number(options.restartDelay) },
           },
         },
-        ...options.memory && {
-          Resources: {
-            Limits: { MemoryBytes: Number(options.memory) }, // bytes
-          },
+        Resources: {
+          Reservations: {
+            ...options.memory ? {
+              MemoryBytes: Number(options.memory),
+            } : {},
+            ...options.cpus ? {
+              NanoCPUs: Number(options.cpus * 1e9),
+            } : {},
+          }, // bytes
         },
         ...or([has('logDriver'), has('logDriverOptions')])(options) && {
           LogDriver: {

package/Docker.test.js

@@ -345,6 +345,7 @@ EXPOSE 8888`,
           readonly: true,
         }],
         memory: 512e6, // bytes
+        cpus: 2,
         restart: 'on-failure:5',
 
         healthCmd: ['wget', '--no-verbose', '--tries=1', '--spider', 'localhost:3000'],
@@ -367,7 +368,17 @@ EXPOSE 8888`,
       })
       assert.equal(response.status, 201)
       const body = await response.json()
-      this.serviceId = body.ID
+      const serviceId = body.ID
+
+      await docker.inspectService(serviceId).then(async response => {
+        const data = await response.json()
+        assert.equal(data.Spec.Labels.foo, 'bar')
+        assert.equal(data.Spec.TaskTemplate.Resources.Reservations.NanoCPUs, 2000000000)
+        assert.equal(data.Spec.TaskTemplate.Resources.Reservations.MemoryBytes, 512000000)
+      })
+
+      this.serviceId1 = serviceId
+
     }
 
     { // create another service
@@ -382,13 +393,19 @@ EXPOSE 8888`,
           target: '/opt/other-volume',
           readonly: true,
         }],
-        memory: 512e6, // bytes
         restart: 'on-failure',
         publish: { 8081: 3001 },
 
         healthCmd: ['wget', '--no-verbose', '--tries=1', '--spider', 'localhost:3001'],
       })
       assert.equal(response.status, 201)
+      const body = await response.json()
+      const serviceId = body.ID
+
+      await docker.inspectService(serviceId).then(async response => {
+        const data = await response.json()
+        assert.equal(Object.keys(data.Spec.TaskTemplate.Resources.Reservations), 0)
+      })
     }
 
     { // listServices
@@ -404,15 +421,8 @@ EXPOSE 8888`,
       assert.equal(body.length, 3) // 2 for hey1, 1 for hey2 (global)
     }
 
-    { // inspectService
-      const response = await docker.inspectService(this.serviceId)
-      assert.equal(response.status, 200)
-      const data = await response.json()
-      assert.equal(data.Spec.Labels.foo, 'bar')
-    }
-
     { // deleteService
-      const response = await docker.deleteService(this.serviceId)
+      const response = await docker.deleteService(this.serviceId1)
       assert.equal(response.status, 200)
     }
 

package/DockerService.js

@@ -36,7 +36,7 @@ const dockerServiceOptions = [
   'rollbackParallelism', 'rollbackDelay',
   'rollbackFailureAction', 'rollbackMonitor', 'rollbackMaxFailureRatio',
   'username', 'password', 'email', 'serveraddress', 'identitytoken',
-  'network',
+  'network', 'memory', 'cpus',
 ]
 
 /**
@@ -58,6 +58,8 @@ const dockerServiceOptions = [
  *   healthTimeout: 20e9|>1e6, // nanoseconds to wait before healthcheck fails
  *   healthRetries: 5|number, // number of retries before unhealhty
  *   healthStartPeriod: >=1e6, // nanoseconds to wait on container init before starting first healthcheck
+ *   memory: number, // memory limit in bytes
+ *   cpus: number, // number of cpus
  *   mounts: Array<{
  *     source: string, // name of volume
  *     target: string, // mounted path inside container

package/DockerService.test.js

@@ -68,6 +68,7 @@ const test = new Test('DockerService', DockerService)
     healthCmd: ['curl', '0.0.0.0:80'],
     restart: 'on-failure:5',
     memory: 512e6, // bytes
+    cpus: 2,
   })
 
   {
@@ -96,7 +97,8 @@ const test = new Test('DockerService', DockerService)
       [{ Type: 'volume', Source: 'other-volume', Target: '/opt/other-volume' }])
     assert.equal(info.Spec.TaskTemplate.RestartPolicy.Condition, 'on-failure')
     assert.equal(info.Spec.TaskTemplate.RestartPolicy.MaxAttempts, 5)
-    assert.equal(info.Spec.TaskTemplate.Resources.Limits.MemoryBytes, 512e6)
+    assert.equal(info.Spec.TaskTemplate.Resources.Reservations.MemoryBytes, 512e6)
+    assert.equal(info.Spec.TaskTemplate.Resources.Reservations.NanoCPUs, 2e9)
     this.myServiceSpec = myService.spec
   }
 

package/package.json

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