Merge pull request apache#7533 from lukaz-sampaio/issue-7275

Docker - Load images
dbalek · Jul 8, 2024 · 1a1a3ac · 1a1a3ac
2 parents cd0bb01 + 7816b34
commit 1a1a3ac
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/ide/docker.api/src/org/netbeans/modules/docker/api/DockerAction.java b/ide/docker.api/src/org/netbeans/modules/docker/api/DockerAction.java
@@ -148,9 +148,9 @@ public List<DockerImage> getImages() {
                 JSONObject json = (JSONObject) o;
                 JSONArray repoTags = (JSONArray) json.get("RepoTags");
                 String id = (String) json.get("Id");
-                long created = (long) json.get("Created");
-                long size = (long) json.get("Size");
-                long virtualSize = (long) json.get("VirtualSize");
+                long created = (long) json.getOrDefault("Created", 0L);
+                long size = (long) json.getOrDefault("Size", 0L);
+                long virtualSize = (long) json.getOrDefault("VirtualSize", size);
                 ret.add(new DockerImage(instance, repoTags, id, created, size, virtualSize));
             }
             return ret;

diff --git a/ide/docker.api/src/org/netbeans/modules/docker/api/DockerImage.java b/ide/docker.api/src/org/netbeans/modules/docker/api/DockerImage.java
@@ -88,6 +88,11 @@ public long getSize() {
         return size;
     }
 
+    /**
+     * @deprecated Removed from Docker Engine in v1.44. Return size value.
+     * @return 
+     */
+    @Deprecated
     public long getVirtualSize() {
         return virtualSize;
     }