graphics() fixed parsing (mac OS)

sebhildebrandt · Jun 22, 2023 · f37d14b · f37d14b
1 parent 6268cb7
commit f37d14b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -82,6 +82,7 @@ For major (breaking) changes - **version 4, 3 and 2** - see end of page.
 
 | Version | Date       | Comment                                                                                             |
 | ------- | ---------- | --------------------------------------------------------------------------------------------------- |
+| 5.18.4  | 2023-06-22 | `graphics()` fixed parsing (mac OS)                                                                 |
 | 5.18.3  | 2023-06-09 | `tests` improved key handling, updated docs                                                         |
 | 5.18.2  | 2023-06-08 | `fsSize()` improved error handling (linux alpine)                                                   |
 | 5.18.1  | 2023-06-07 | `networkInterfaces()` cleaned up testVirtualNic                                                     |

diff --git a/docs/history.html b/docs/history.html
@@ -57,6 +57,11 @@ <h3>Full version history</h3>
                     </tr>
                   </thead>
                   <tbody>
+                    <tr>
+                      <th scope="row">5.18.4</th>
+                      <td>2023-06-22</td>
+                      <td><span class="code">graphics()</span> fixed parsing (mac OS)</td>
+                    </tr>
                     <tr>
                       <th scope="row">5.18.3</th>
                       <td>2023-06-09</td>

diff --git a/docs/index.html b/docs/index.html
@@ -170,7 +170,7 @@
       <img class="logo" src="assets/logo.png" alt="logo">
       <div class="title">systeminformation</div>
       <div class="subtitle"><span id="typed"></span>&nbsp;</div>
-      <div class="version">New Version: <span id="version">5.18.3</span></div>
+      <div class="version">New Version: <span id="version">5.18.4</span></div>
       <button class="btn btn-light" onclick="location.href='https://github.com/sebhildebrandt/systeminformation'">View on Github <i class=" fab fa-github"></i></button>
     </div>
     <div class="down">

diff --git a/lib/docker.js b/lib/docker.js
@@ -484,7 +484,7 @@ function dockerContainerStats(containerIDs, callback) {
         containerArray = [];
         dockerContainers().then(allContainers => {
           for (let container of allContainers) {
-            containerArray.push(container.id);
+            containerArray.push(container.id.substring(0, 12));
           }
           if (containerArray.length) {
             dockerContainerStats(containerArray.join(',')).then(result => {
@@ -555,8 +555,8 @@ function dockerContainerStatsSingle(containerID) {
             _docker_socket.getStats(containerID, data => {
               try {
                 let stats = data;
-
                 if (!stats.message) {
+                  if (data.id) { result.id = data.id; }
                   result.memUsage = (stats.memory_stats && stats.memory_stats.usage ? stats.memory_stats.usage : 0);
                   result.memLimit = (stats.memory_stats && stats.memory_stats.limit ? stats.memory_stats.limit : 0);
                   result.memPercent = (stats.memory_stats && stats.memory_stats.usage && stats.memory_stats.limit ? stats.memory_stats.usage / stats.memory_stats.limit * 100.0 : 0);