Merge pull request #3 from nunokisc/main

add new service elements, change opts to output inside buildHostConfig

Author: apocas

lib/services.js

@@ -104,6 +104,47 @@ module.exports = async function (docker, projectName, recipe, output) {
     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 {
       var container = await docker.createContainer(opts);
 
@@ -156,81 +197,156 @@ var buildHostConfig = function (service, recipe) {
   }
 
   if (service.cpu_count !== undefined) {
-    opts.CpuCount = service.cpu_count;
+    output.CpuCount = service.cpu_count;
   }
   if (service.cpu_percent !== undefined) {
-    opts.CpuPercent = service.cpu_percent;
+    output.CpuPercent = service.cpu_percent;
   }
   if (service.cpu_shares !== undefined) {
-    opts.CpuShares = service.cpu_shares;
+    output.CpuShares = service.cpu_shares;
   }
   if (service.cpu_period !== undefined) {
-    opts.CpuPeriod = service.cpu_period;
+    output.CpuPeriod = service.cpu_period;
   }
   if (service.cpu_quota !== undefined) {
-    opts.CpuQuota = service.cpu_quota;
+    output.CpuQuota = service.cpu_quota;
   }
   if (service.cpu_rt_runtime !== undefined) {
-    opts.CpuRealtimeRuntime = service.cpu_rt_runtime;
+    output.CpuRealtimeRuntime = service.cpu_rt_runtime;
   }
   if (service.cpu_rt_period !== undefined) {
-    opts.CpuRealtimePeriod = service.cpu_rt_period;
+    output.CpuRealtimePeriod = service.cpu_rt_period;
   }
   if (service.cpuset !== undefined) {
-    opts.CpusetCpus = service.cpuset;
+    output.CpusetCpus = service.cpuset;
   }
   if (service.cap_add !== undefined) {
-    opts.CapAdd = service.cap_add;
+    output.CapAdd = service.cap_add;
   }
   if (service.cap_drop !== undefined) {
-    opts.CapDrop = service.cap_drop;
+    output.CapDrop = service.cap_drop;
   }
   if (service.cgroup_parent !== undefined) {
-    opts.CgroupParent = service.cgroup_parent;
+    output.CgroupParent = service.cgroup_parent;
   }
   if (service.device_cgroup_rules !== undefined) {
-    opts.DeviceCgroupRules = service.device_cgroup_rules;
+    output.DeviceCgroupRules = service.device_cgroup_rules;
   }
   if (service.dns !== undefined) {
-    opts.Dns = service.dns;
+    output.Dns = service.dns;
   }
   if (service.dns_opt !== undefined) {
-    opts.DnsOptions = service.dns_opt;
+    output.DnsOptions = service.dns_opt;
   }
   if (service.dns_search !== undefined) {
-    opts.DnsSearch = service.dns_search;
+    output.DnsSearch = service.dns_search;
   }
   if (service.extra_hosts !== undefined) {
-    opts.ExtraHosts = service.extra_hosts;
+    output.ExtraHosts = service.extra_hosts;
   }
   if (service.group_add !== undefined) {
-    opts.GroupAdd = service.group_add;
+    output.GroupAdd = service.group_add;
   }
   if (service.init !== undefined) {
-    opts.Init = service.init;
+    output.Init = service.init;
   }
   if (service.ipc !== undefined) {
-    opts.IpcMode = service.ipc;
+    output.IpcMode = service.ipc;
   }
   if (service.isolation !== undefined) {
-    opts.Isolation = service.isolation;
+    output.Isolation = service.isolation;
   }
   if (service.mem_swappiness !== undefined) {
-    opts.MemorySwappiness = service.mem_swappiness;
+    output.MemorySwappiness = service.mem_swappiness;
   }
   if (service.oom_kill_disable !== undefined) {
-    opts.OomKillDisable = service.oom_kill_disable;
+    output.OomKillDisable = service.oom_kill_disable;
   }
   if (service.oom_score_adj !== undefined) {
-    opts.OomScoreAdj = service.oom_score_adj;
+    output.OomScoreAdj = service.oom_score_adj;
   }
   if (service.pid !== undefined) {
-    opts.PidMode = service.pid;
+    output.PidMode = service.pid;
   }
   if (service.pids_limit !== undefined) {
-    opts.PidsLimit = service.pids_limit;
+    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;
 }