Improve PullImageCmd for pulling an image through docker swarm.

hawky-4s- · hawky-4s- · commit a39e52dca132 · 2015-10-09T21:54:45.000+02:00
diff --git a/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java b/src/main/java/com/github/dockerjava/api/model/PullResponseItem.java
@@ -23,7 +23,7 @@ public boolean isPullSuccessIndicated() {
         }
 
         return (getStatus().contains("Download complete") || getStatus().contains("Image is up to date") || getStatus()
-                .contains("Downloaded newer image"));
+                .contains("Downloaded newer image") || getStatus().contains(": downloaded"));
     }
 
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java b/src/main/java/com/github/dockerjava/core/command/PullImageResultCallback.java
@@ -3,12 +3,14 @@
  */
 package com.github.dockerjava.core.command;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.github.dockerjava.api.DockerClientException;
 import com.github.dockerjava.api.model.PullResponseItem;
 import com.github.dockerjava.core.async.ResultCallbackTemplate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  *
@@ -19,14 +21,71 @@ public class PullImageResultCallback extends ResultCallbackTemplate<PullImageRes
 
     private final static Logger LOGGER = LoggerFactory.getLogger(PullImageResultCallback.class);
 
+    private boolean isSwarm = false;
+    private Map<String, PullResponseItem> results = null;
     private PullResponseItem latestItem = null;
 
     @Override
     public void onNext(PullResponseItem item) {
-        this.latestItem = item;
+        // only do it once
+        if (results == null && latestItem == null) {
+            checkForDockerSwarmResponse(item);
+        }
+
+        if (isSwarm) {
+            handleDockerSwarmResponse(item);
+        } else {
+            handleDockerClientResponse(item);
+        }
         LOGGER.debug(item.toString());
     }
 
+    private void checkForDockerSwarmResponse(PullResponseItem item) {
+        if (item.getStatus().matches("Pulling\\s.+\\.{3}$")) {
+            isSwarm = true;
+            LOGGER.debug("Communicating with Docker Swarm.");
+        }
+    }
+
+    private void handleDockerSwarmResponse(PullResponseItem item) {
+        if (results == null) {
+            results = new HashMap<String, PullResponseItem>();
+        }
+        results.put(item.getId(), item);
+    }
+
+    private void checkDockerSwarmPullSuccessful() {
+        if (results.isEmpty()) {
+            throw new DockerClientException("Could not pull image");
+        } else {
+            boolean pullFailed = false;
+            StringBuilder sb = new StringBuilder();
+
+            for (PullResponseItem pullResponseItem : results.values()) {
+                if (!pullResponseItem.isPullSuccessIndicated()) {
+                    pullFailed = true;
+                    sb.append("[" + pullResponseItem.getId() + ";" + pullResponseItem.getError() + "]");
+                }
+            }
+
+            if (pullFailed) {
+                throw new DockerClientException("Could not pull image: " + sb.toString());
+            }
+        }
+    }
+
+    private void handleDockerClientResponse(PullResponseItem item) {
+        latestItem = item;
+    }
+
+    private void checkDockerClientPullSuccessful() {
+        if (latestItem == null) {
+            throw new DockerClientException("Could not pull image");
+        } else if (!latestItem.isPullSuccessIndicated()) {
+            throw new DockerClientException("Could not pull image: " + latestItem.getError());
+        }
+    }
+
     /**
      * Awaits the image to be pulled successful.
      *
@@ -40,10 +99,10 @@ public void awaitSuccess() {
             throw new DockerClientException("", e);
         }
 
-        if (latestItem == null) {
-            throw new DockerClientException("Could not pull image");
-        } else if (!latestItem.isPullSuccessIndicated()) {
-            throw new DockerClientException("Could not pull image: " + latestItem.getError());
+        if (isSwarm) {
+            checkDockerSwarmPullSuccessful();
+        } else {
+            checkDockerClientPullSuccessful();
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public boolean isPullSuccessIndicated() {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`return (getStatus().contains("Download complete") \|\| getStatus().contains("Image is up to date") \|\| getStatus()`
`26`		`- .contains("Downloaded newer image"));`
	`26`	`+ .contains("Downloaded newer image") \|\| getStatus().contains(": downloaded"));`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`}`