#662 Retry any exceptions (not just DockerClientException) on image…

… pull (#663)
testcontainers · Apr 28, 2018 · 67cde07 · 67cde07
1 parent 2b48306
commit 67cde07
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@ All notable changes to this project will be documented in this file.
 ## UNRELEASED
 
 ### Fixed
+- Retry any exceptions (not just `DockerClientException`) on image pull ([\#662](https://github.com/testcontainers/testcontainers-java/issues/662))
 
 ### Changed
 

diff --git a/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java b/core/src/main/java/org/testcontainers/images/RemoteDockerImage.java
@@ -51,7 +51,7 @@ protected final String resolve() {
             profiler.start("Check local images");
 
             int attempts = 0;
-            DockerClientException lastException = null;
+            Exception lastException = null;
             while (true) {
                 // Does our cache already know the image?
                 if (AVAILABLE_IMAGE_NAME_CACHE.contains(imageName)) {
@@ -98,10 +98,10 @@ protected final String resolve() {
                         .pullImageCmd(imageName.getUnversionedPart())
                         .withTag(imageName.getVersionPart())
                         .exec(callback);
-                    callback.awaitSuccess();
+                    callback.awaitCompletion();
                     AVAILABLE_IMAGE_NAME_CACHE.add(imageName);
                     break;
-                } catch (DockerClientException e) {
+                } catch (Exception e) {
                     lastException = e;
                 }
             }