dockerode-compose - npm Package Compare versions

Comparing version 1.0.3 to 1.1.0

lib/services.js

@@ -13,3 +13,3 @@ const tools = require('./tools');
       'Image': service.image,
-      'HostConfig': buildHostConfig(service),
+      'HostConfig': buildHostConfig(service, recipe),
       'Env': buildEnvVars(service),
@@ -84,19 +84,67 @@ 'NetworkingConfig': {
 
-    if (service.volumes) {
-      opts['Volumes'] = {};
-      for (var volume of service.volumes) {
-        if (typeof volume === 'string' || volume instanceof String) {
-          var v = volume.split(':');
-          opts['Volumes'][v[1]] = {};
-        } else {
-          if (volume.target) {
-            opts['Volumes'][volume.target] = {};
-          }
-        }
+    if (service.volumes_from) {
+      for (var volume_from of service.volumes_from) {
+        var vf = volume_from.split(':');
+        var svf = recipe.services[vf[0]];
+        buildVolumes(svf.volumes, opts);
       }
     }
 
+    if (service.volumes) {
+      buildVolumes(service.volumes, opts);
+    }
+
     if (service.name !== undefined) {
-      opts.Name = serviceName;
+      opts.Name = service.container_name || serviceName;
     }
+    if (service.domainname !== undefined) {
+      opts.Domainname = service.domainname;
+    }
+    if (service.hostname !== undefined) {
+      opts.Hostname = service.hostname;
+    }
+    if (service.mac_address !== undefined) {
+      opts.MacAddress = service.mac_address;
+    }
+    if (service.stdin_open !== undefined) {
+      opts.OpenStdin = service.stdin_open;
+    }
+    if (service.stop_grace_period !== undefined) {
+      let period = parseInt(service.stop_grace_period)
+      if (service.stop_grace_period == period) {
+        opts.StopTimeout = service.stop_grace_period;
+      } else if (service.stop_grace_period.includes('m') && service.stop_grace_period.includes('s')) {
+        let minutes = parseInt(service.stop_grace_period.substring(0, service.stop_grace_period.indexOf('m')))
+        let seconds = parseInt(service.stop_grace_period.substring(service.stop_grace_period.indexOf('m') + 1, service.stop_grace_period.indexOf('s')))
+        opts.StopTimeout = (minutes * 60) + seconds
+      } else {
+        opts.StopTimeout = service.stop_grace_period.substring(0, service.stop_grace_period.length - 2)
+      }
+    }
+    if (service.stop_signal !== undefined) {
+      opts.StopSignal = service.stop_signal;
+    }
+    if (service.tty !== undefined) {
+      opts.Tty = service.tty;
+    }
+    if (service.user !== undefined) {
+      opts.User = service.user;
+    }
+    if (service.working_dir !== undefined) {
+      opts.WorkingDir = service.working_dir;
+    }
+    if (service.labels !== undefined) {
+      if (service.labels.length > 0) {
+        var labels = {};
+        for (var labelsb of service.labels) {
+          var p = labelsb.split('=');
+          if (p[1] === undefined)
+            p[1] = ''
+          labels[p[0]] = p[1]
+        }
+        opts.Labels = labels
+      } else {
+        opts.Labels = service.labels
+      }
+    }
     try {
@@ -127,3 +175,3 @@ var container = await docker.createContainer(opts);
 //ToDo: complete the compose specification
-var buildHostConfig = function (service) {
+var buildHostConfig = function (service, recipe) {
   var output = {
@@ -133,28 +181,14 @@ 'RestartPolicy': { 'Name': service.restart }
 
-  if (service.volumes) {
-    output['Binds'] = [];
-
-    for (var volume of service.volumes) {
-      if (typeof volume === 'string' || volume instanceof String) {
-        output['Binds'].push(volume);
-      } else {
-        var volumestr = '';
-        if (volume.source && volume.target) {
-          volumestr += volume.source + ':' + volume.target + ':';
-        }
-        if (volume.read_only) {
-          volumestr += 'ro,';
-        }
-        if (volume.volume && volume.volume.nocopy) {
-          volumestr += 'nocopy,';
-        }
-        if (volume.bind && volume.bind.propagation) {
-          volumestr += volume.bind.propagation + ',';
-        }
-        volumestr = volumestr.slice(0, -1);
-        output['Binds'].push(volumestr);
-      }
+  if (service.volumes_from) {
+    for (var volume_from of service.volumes_from) {
+      var vf = volume_from.split(':');
+      var svf = recipe.services[vf[0]];
+      buildVolumesHostconfig(svf.volumes, output, vf[1]);
     }
   }
 
+  if (service.volumes) {
+    buildVolumesHostconfig(service.volumes, output);
+  }
+
   if (service.ports && service.ports.length > 0) {
@@ -169,5 +203,203 @@ var ports = {};
 
+  if (service.cpu_count !== undefined) {
+    output.CpuCount = service.cpu_count;
+  }
+  if (service.cpu_percent !== undefined) {
+    output.CpuPercent = service.cpu_percent;
+  }
+  if (service.cpu_shares !== undefined) {
+    output.CpuShares = service.cpu_shares;
+  }
+  if (service.cpu_period !== undefined) {
+    output.CpuPeriod = service.cpu_period;
+  }
+  if (service.cpu_quota !== undefined) {
+    output.CpuQuota = service.cpu_quota;
+  }
+  if (service.cpu_rt_runtime !== undefined) {
+    output.CpuRealtimeRuntime = service.cpu_rt_runtime;
+  }
+  if (service.cpu_rt_period !== undefined) {
+    output.CpuRealtimePeriod = service.cpu_rt_period;
+  }
+  if (service.cpuset !== undefined) {
+    output.CpusetCpus = service.cpuset;
+  }
+  if (service.cap_add !== undefined) {
+    output.CapAdd = service.cap_add;
+  }
+  if (service.cap_drop !== undefined) {
+    output.CapDrop = service.cap_drop;
+  }
+  if (service.cgroup_parent !== undefined) {
+    output.CgroupParent = service.cgroup_parent;
+  }
+  if (service.device_cgroup_rules !== undefined) {
+    output.DeviceCgroupRules = service.device_cgroup_rules;
+  }
+  if (service.dns !== undefined) {
+    output.Dns = service.dns;
+  }
+  if (service.dns_opt !== undefined) {
+    output.DnsOptions = service.dns_opt;
+  }
+  if (service.dns_search !== undefined) {
+    output.DnsSearch = service.dns_search;
+  }
+  if (service.extra_hosts !== undefined) {
+    output.ExtraHosts = service.extra_hosts;
+  }
+  if (service.group_add !== undefined) {
+    output.GroupAdd = service.group_add;
+  }
+  if (service.init !== undefined) {
+    output.Init = service.init;
+  }
+  if (service.ipc !== undefined) {
+    output.IpcMode = service.ipc;
+  }
+  if (service.isolation !== undefined) {
+    output.Isolation = service.isolation;
+  }
+  if (service.mem_swappiness !== undefined) {
+    output.MemorySwappiness = service.mem_swappiness;
+  }
+  if (service.oom_kill_disable !== undefined) {
+    output.OomKillDisable = service.oom_kill_disable;
+  }
+  if (service.oom_score_adj !== undefined) {
+    output.OomScoreAdj = service.oom_score_adj;
+  }
+  if (service.pid !== undefined) {
+    output.PidMode = service.pid;
+  }
+  if (service.pids_limit !== undefined) {
+    output.PidsLimit = service.pids_limit;
+  }
+  if (service.privileged !== undefined) {
+    output.Privileged = service.privileged;
+  }
+  if (service.read_only !== undefined) {
+    output.ReadonlyRootfs = service.read_only;
+  }
+  if (service.runtime !== undefined) {
+    output.Runtime = service.runtime;
+  }
+  if (service.security_opt !== undefined) {
+    output.SecurityOpt = service.security_opt;
+  }
+  if (service.shm_size !== undefined) {
+    output.ShmSize = service.shm_size;
+  }
+  if (service.storage_opt !== undefined) {
+    output.StorageOpt = service.storage_opt;
+  }
+  if (service.sysctls !== undefined) {
+    if (service.sysctls.length > 0) {
+      var sysctls = {};
+      for (var sysctlsb of service.sysctls) {
+        var p = sysctlsb.split('=');
+        sysctls[p[0]] = p[1]
+      }
+      output.Sysctls = sysctls
+    } else {
+      let sysctlKeys = Object.keys(service.sysctls)
+      let newSysctls = {}
+      for (var key of sysctlKeys) {
+        newSysctls[key] = service.sysctls[key].toString();
+      }
+      output.Sysctls = newSysctls
+    }
+  }
+  if (service.userns_mode !== undefined) {
+    output.UsernsMode = service.userns_mode;
+  }
+  if (service.tmpfs !== undefined) {
+    if (Array.isArray(service.tmpfs)) {
+      var tmpfs = {};
+      for (var tmpfsb of service.tmpfs) {
+        var p = tmpfsb.split(':');
+        if (p[1] === undefined)
+          p[1] = '';
+        tmpfs[p[0]] = p[1];
+      }
+      output.Tmpfs = tmpfs;
+    } else {
+      var tmpfs = {};
+      var p = service.tmpfs.split(':');
+      if (p[1] === undefined)
+        p[1] = '';
+      tmpfs[p[0]] = p[1];
+      output.Tmpfs = tmpfs;
+    }
+  }
+  if (service.ulimits !== undefined) {
+    let ulimitsKeys = Object.keys(service.ulimits);
+    let ulimitsArray = []
+    for (var key of ulimitsKeys) {
+      let ulimitsObject = {}
+      if (typeof service.ulimits[key] === 'object') {
+        ulimitsObject.Name = key;
+        ulimitsObject.Soft = service.ulimits[key].soft;
+        ulimitsObject.Hard = service.ulimits[key].hard;
+        ulimitsArray.push(ulimitsObject);
+      } else {
+        ulimitsObject.Name = key;
+        ulimitsObject.Soft = service.ulimits[key];
+        ulimitsObject.Hard = service.ulimits[key];
+        ulimitsArray.push(ulimitsObject);
+      }
+    }
+    output.Ulimits = ulimitsArray;
+  }
   return output;
 }
 
+var buildVolumesHostconfig = function (volumes, output, type) {
+  if (output['Binds'] === undefined) {
+    output['Binds'] = [];
+  }
+  for (var volume of volumes) {
+    if (typeof volume === 'string' || volume instanceof String) {
+      var aux = volume;
+      if (type == 'ro') {
+        aux += ':ro'
+      }
+      output['Binds'].push(aux);
+    } else {
+      var volumestr = '';
+      if (volume.source && volume.target) {
+        volumestr += volume.source + ':' + volume.target + ':';
+      }
+      if (volume.read_only || type == 'ro') {
+        volumestr += 'ro,';
+      }
+      if (volume.volume && volume.volume.nocopy) {
+        volumestr += 'nocopy,';
+      }
+      if (volume.bind && volume.bind.propagation) {
+        volumestr += volume.bind.propagation + ',';
+      }
+      volumestr = volumestr.slice(0, -1);
+      output['Binds'].push(volumestr);
+    }
+  }
+}
+
+var buildVolumes = function (volumes, opts) {
+  if (opts['Volumes'] === undefined) {
+    opts['Volumes'] = {};
+  }
+  for (var volume of volumes) {
+    if (typeof volume === 'string' || volume instanceof String) {
+      var v = volume.split(':');
+      opts['Volumes'][v[1]] = {};
+    } else {
+      if (volume.target) {
+        opts['Volumes'][volume.target] = {};
+      }
+    }
+  }
+}
+
 var buildEnvVars = function (service) {
@@ -174,0 +406,0 @@ var output = [];

package.json

 {
   "name": "dockerode-compose",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "description": "docker-compose in nodejs using dockerode",
@@ -5,0 +5,0 @@ "main": "./compose.js",

README.md

@@ -7,6 +7,3 @@ # dockerode-compose
 
-Work in progress...
 
-Wordpress example builds successfully.
-
 ### ToDo:
@@ -13,0 +10,0 @@ * HostConfig (and other spec) needs to be finished.

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

39076

increased by22.22%

Lines of code

657

increased by53.5%

Worsened metrics

Number of lines in readme file

56

decreased by-5.08%

No dependency changes