Temporary workaround when image pulled but docker-java fails. (Kostya…

…Sha#207) * Temporary workaround when image pulled but docker-java fails. * And swarm also * Checkstyle
alexeygrigorovaurea · Oct 22, 2017 · f53ef6e · f53ef6e
1 parent 700bad4
commit f53ef6e
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 8 deletions.
diff --git a/...another-docker-plugin/src/main/java/com/github/kostyasha/yad/commons/DockerPullImage.java b/...another-docker-plugin/src/main/java/com/github/kostyasha/yad/commons/DockerPullImage.java
@@ -8,6 +8,8 @@
 import com.github.kostyasha.yad.credentials.DockerRegistryAuthCredentials;
 import com.github.kostyasha.yad_docker_java.com.github.dockerjava.api.DockerClient;
 import com.github.kostyasha.yad_docker_java.com.github.dockerjava.api.command.PullImageCmd;
+import com.github.kostyasha.yad_docker_java.com.github.dockerjava.api.exception.DockerClientException;
+import com.github.kostyasha.yad_docker_java.com.github.dockerjava.api.exception.NotFoundException;
 import com.github.kostyasha.yad_docker_java.com.github.dockerjava.api.model.Image;
 import com.github.kostyasha.yad_docker_java.com.github.dockerjava.core.NameParser;
 import com.github.kostyasha.yad_docker_java.org.apache.commons.lang.StringUtils;
@@ -127,9 +129,23 @@ public void exec(@Nonnull final DockerClient client, @Nonnull final String image
                 }
             }
 
-            pullImageCmd
-                    .exec(new DockerPullImageListenerLogger(listener))
-                    .awaitSuccess();
+            try {
+                pullImageCmd
+                        .exec(new DockerPullImageListenerLogger(listener))
+                        .awaitSuccess();
+            } catch (DockerClientException exception) {
+                String exMsg = exception.getMessage();
+                if (exMsg.contains("Could not pull image: Digest:") ||
+                        exMsg.contains(": downloaded")) {
+                    try {
+                        client.inspectImageCmd(imageName).exec();
+                    } catch (NotFoundException notFoundEx) {
+                        throw exception;
+                    }
+                } else {
+                    throw exception;
+                }
+            }
 
             long pullTime = System.currentTimeMillis() - startTime;
             LOG.info("Finished pulling image '{}', took {} ms", imageName, pullTime);
@@ -155,11 +171,11 @@ protected boolean shouldPullImage(DockerClient client, String imageName) {
         List<Image> images = client.listImagesCmd().exec();
 
         boolean hasImage = images.stream().anyMatch(image ->
-            nonNull(image.getRepoTags()) &&
-                    Arrays.stream(image.getRepoTags())
-                            .anyMatch(repoTag ->
-                                    repoTag.contains(fullImageName) || repoTag.contains("docker.io/" + fullImageName)
-                            )
+                nonNull(image.getRepoTags()) &&
+                        Arrays.stream(image.getRepoTags())
+                                .anyMatch(repoTag ->
+                                        repoTag.contains(fullImageName) || repoTag.contains("docker.io/" + fullImageName)
+                                )
         );
 
         return hasImage ?

diff --git a/...her-docker-plugin/src/test/java/com/github/kostyasha/yad/commons/DockerPullImageTest.java b/...her-docker-plugin/src/test/java/com/github/kostyasha/yad/commons/DockerPullImageTest.java
@@ -34,6 +34,8 @@ public static Collection<Object[]> data() {
         return Arrays.asList(new Object[][]{
                 {"docker.io/kostyasha/yet-another-docker-plugin:wget-master",
                         "kostyasha/yet-another-docker-plugin:wget-master", PULL_LATEST, false},
+                {"kostyasha/yet-another-docker-plugin:wget-master",
+                        "kostyasha/yet-another-docker-plugin:wget-master", PULL_LATEST, false},
                 {"", "repo/name", PULL_LATEST, true},
                 {"repo/name:latest", "repo/name", PULL_LATEST, true},
                 {"", "repo/name:latest", PULL_LATEST, true},
@@ -48,6 +50,7 @@ public static Collection<Object[]> data() {
                 {"", "repo/name:1.0", PULL_ALWAYS, true},
                 {"repo/name:1.0", "repo/name:1.0", PULL_ALWAYS, true},
 
+
                 {"", "repo/name", PULL_NEVER, false},
                 {"repo/name:latest", "repo/name", PULL_NEVER, false},
                 {"", "repo/name:latest", PULL_NEVER, false},