diff --git a/CHANGELOG.md b/CHANGELOG.md index 293a6db..fdd3555 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ For major (breaking) changes - version 3 and 2 see end of page. | Version | Date | Comment | | -------------- | -------------- | -------- | +| 4.11.5 | 2019-06-19 | `dockerAll()` bug fix | | 4.11.4 | 2019-06-17 | type definitions bug fix | | 4.11.3 | 2019-06-16 | `graphics()` optimization windows | | 4.11.2 | 2019-06-16 | `wifiNetworks()` bug fixes | diff --git a/docs/history.html b/docs/history.html index 574427a..90af90b 100644 --- a/docs/history.html +++ b/docs/history.html @@ -83,6 +83,11 @@ + + 4.11.5 + 2019-06-19 + dockerAll() bug fix + 4.11.4 2019-06-17 diff --git a/docs/index.html b/docs/index.html index e97b826..a5047e1 100644 --- a/docs/index.html +++ b/docs/index.html @@ -168,7 +168,7 @@
systeminformation
-
Current Version: 4.11.4
+
Current Version: 4.11.5
diff --git a/lib/docker.js b/lib/docker.js index 676fe7c..fa86bbe 100644 --- a/lib/docker.js +++ b/lib/docker.js @@ -532,17 +532,17 @@ function dockerAll(callback) { result.forEach(function (element) { dockerContainerStats(element.id).then(res => { // include stats in array - element.mem_usage = res.mem_usage; - element.mem_limit = res.mem_limit; - element.mem_percent = res.mem_percent; - element.cpu_percent = res.cpu_percent; - element.pids = res.pids; - element.netIO = res.netIO; - element.blockIO = res.blockIO; - element.cpu_stats = res.cpu_stats; - element.precpu_stats = res.precpu_stats; - element.memory_stats = res.memory_stats; - element.networks = res.networks; + element.mem_usage = res[0].mem_usage; + element.mem_limit = res[0].mem_limit; + element.mem_percent = res[0].mem_percent; + element.cpu_percent = res[0].cpu_percent; + element.pids = res[0].pids; + element.netIO = res[0].netIO; + element.blockIO = res[0].blockIO; + element.cpu_stats = res[0].cpu_stats; + element.precpu_stats = res[0].precpu_stats; + element.memory_stats = res[0].memory_stats; + element.networks = res[0].networks; dockerContainerProcesses(element.id).then(processes => { element.processes = processes; diff --git a/lib/util.js b/lib/util.js index 022b0e2..43b983b 100644 --- a/lib/util.js +++ b/lib/util.js @@ -37,7 +37,7 @@ const execOptsWin = { windowsHide: true, maxBuffer: 1024 * 2000, encoding: 'UTF-8', - env: util._extend(process.env, { LANG: 'en_US.UTF-8' }) + env: util._extend({}.process.env, { LANG: 'en_US.UTF-8' }) };