You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by mr...@apache.org on 2018/11/20 14:21:02 UTC
svn commit: r1847011 -
/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDockerRule.java
Author: mreutegg
Date: Tue Nov 20 14:21:01 2018
New Revision: 1847011
URL: http://svn.apache.org/viewvc?rev=1847011&view=rev
Log:
OAK-7889: Test failure: Unable to start Docker container
Pull image early
Modified:
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDockerRule.java
Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDockerRule.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDockerRule.java?rev=1847011&r1=1847010&r2=1847011&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDockerRule.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDockerRule.java Tue Nov 20 14:21:01 2018
@@ -34,6 +34,8 @@ public class MongoDockerRule extends Doc
private static final String CONFIG_NAME = "MongoDB";
+ private static final String IMAGE = "mongo:" + MongoUtils.VERSION;
+
private static final boolean DOCKER_AVAILABLE;
static {
@@ -43,9 +45,10 @@ public class MongoDockerRule extends Doc
.registryAuthSupplier(new FixedRegistryAuthSupplier())
.build()) {
client.ping();
+ client.pull(IMAGE);
available = true;
- } catch (Exception e) {
- LOG.info("Cannot connect to docker", e);
+ } catch (Throwable t) {
+ LOG.info("Cannot connect to docker or pull image", t);
}
DOCKER_AVAILABLE = available;
}
@@ -53,7 +56,7 @@ public class MongoDockerRule extends Doc
public MongoDockerRule() {
super(ImmutableDockerConfig.builder()
.name(CONFIG_NAME)
- .image("mongo:" + MongoUtils.VERSION)
+ .image(IMAGE)
.ports("27017")
.allowRunningBetweenUnitTests(true)
.alwaysRemoveContainer(true)