Must have messed up the Docker image generation somehow, and I have no idea how it was supposed to work in the first place.

Author: niclash

extensions/entitystore-jclouds/src/test/java/org/apache/polygene/entitystore/jclouds/JCloudsS3Test.java

@@ -20,6 +20,7 @@
 package org.apache.polygene.entitystore.jclouds;
 
 import com.github.junit5docker.Docker;
+import com.github.junit5docker.Environment;
 import com.github.junit5docker.Port;
 import com.github.junit5docker.WaitFor;
 import org.apache.polygene.api.common.Visibility;
@@ -28,9 +29,13 @@
 import org.apache.polygene.test.EntityTestAssembler;
 import org.apache.polygene.test.entity.AbstractEntityStoreTest;
 
-@Docker( image = "org.apache.polygene:org.apache.polygene.internal.docker-s3server",
+@Docker( image = "s3server",
          ports = @Port( exposed = 8801, inner = 8000),
          waitFor = @WaitFor( value = "server started", timeoutInMillis = 30000),
+         environments = {
+             @Environment( key = "SCALITY_ACCESS_KEY_ID", value = "dummyIdentifier" ),
+             @Environment( key = "SCALITY_SECRET_ACCESS_KEY", value = "dummyCredential" )
+         },
          newForEachCase = false
 )
 public class JCloudsS3Test extends AbstractEntityStoreTest

extensions/entitystore-jclouds/src/test/java/org/apache/polygene/entitystore/jclouds/JCloudsS3TestSuite.java

@@ -20,16 +20,21 @@
 package org.apache.polygene.entitystore.jclouds;
 
 import com.github.junit5docker.Docker;
+import com.github.junit5docker.Environment;
 import com.github.junit5docker.Port;
 import com.github.junit5docker.WaitFor;
 import org.apache.polygene.api.common.Visibility;
 import org.apache.polygene.bootstrap.ModuleAssembly;
 import org.apache.polygene.entitystore.jclouds.assembly.JCloudsEntityStoreAssembler;
 import org.apache.polygene.test.entity.model.EntityStoreTestSuite;
 
-@Docker( image = "org.apache.polygene:org.apache.polygene.internal.docker-s3server",
-         ports = @Port( exposed = 8801, inner = 8000),
-         waitFor = @WaitFor( value = "server started", timeoutInMillis = 30000),
+@Docker( image = "s3server",
+         ports = @Port( exposed = 8801, inner = 8000 ),
+         waitFor = @WaitFor( value = "server started", timeoutInMillis = 30000 ),
+         environments = {
+             @Environment( key = "SCALITY_ACCESS_KEY_ID", value = "dummyIdentifier" ),
+             @Environment( key = "SCALITY_SECRET_ACCESS_KEY", value = "dummyCredential" )
+         },
          newForEachCase = false
 )
 public class JCloudsS3TestSuite extends EntityStoreTestSuite

extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreTest.java

@@ -35,7 +35,7 @@
 /**
  * Test the MongoDBEntityStoreService.
  */
-@Docker( image = "org.apache.polygene:org.apache.polygene.internal.docker-mongo",
+@Docker( image = "mongo",
          ports = @Port( exposed = 8801, inner = 27017),
          newForEachCase = false
 )

extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreTestSuite.java

@@ -34,7 +34,7 @@
 /**
  * Test the MongoDBEntityStoreService.
  */
-@Docker( image = "org.apache.polygene:org.apache.polygene.internal.docker-mongo",
+@Docker( image = "mongo",
          ports = @Port( exposed = 8801, inner = 27017),
          waitFor = @WaitFor( value = "MongoDB starting", timeoutInMillis = 30000),
          newForEachCase = false

extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoDBEntityStoreWithCacheTest.java

@@ -34,7 +34,7 @@
 /**
  * Test the MongoDBEntityStoreService usage with a CachePool.
  */
-@Docker( image = "org.apache.polygene:org.apache.polygene.internal.docker-mongo",
+@Docker( image = "mongo",
          ports = @Port( exposed = 8801, inner = 27017),
          newForEachCase = false
 )

extensions/entitystore-riak/src/test/java/org/apache/polygene/entitystore/riak/RiakEntityStoreTest.java

@@ -29,7 +29,7 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 
-@Docker( image = "org.apache.polygene:org.apache.polygene.internal.docker-riak",
+@Docker( image = "riak",
          ports = @Port( exposed = 8801, inner = 8087),
          waitFor = @WaitFor( value = "riak_auth_mods started on node", timeoutInMillis = 60000),
          newForEachCase = false

extensions/entitystore-riak/src/test/java/org/apache/polygene/entitystore/riak/RiakEntityStoreTestSuite.java

@@ -29,7 +29,7 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 
-@Docker( image = "org.apache.polygene:org.apache.polygene.internal.docker-riak",
+@Docker( image = "riak",
          ports = @Port( exposed = 8801, inner = 8087),
          waitFor = @WaitFor( value = "riak_auth_mods started on node", timeoutInMillis = 60000),
          newForEachCase = false

extensions/entitystore-riak/src/test/java/org/apache/polygene/entitystore/riak/RiakEntityStoreWithCacheTest.java

@@ -32,7 +32,7 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 
-@Docker( image = "org.apache.polygene:org.apache.polygene.internal.docker-riak",
+@Docker( image = "riak",
          ports = @Port( exposed = 8801, inner = 8087 ),
          waitFor = @WaitFor( value = "riak_auth_mods started on node", timeoutInMillis = 60000 ),
          newForEachCase = false

extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MariaDbEntityStoreTest.java

@@ -36,14 +36,12 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Disabled;
 
-@Disabled( "Waiting response from JOOQ to fix SQL generation. VARCHAR instead of CHAR")
-@Docker( image = "org.apache.polygene:org.apache.polygene.internal.docker-mariadb",
+@Docker( image = "mariadb",
          ports = @Port( exposed = 8801, inner = 3306),
          environments = {
              @Environment( key = "MYSQL_ROOT_PASSWORD", value = ""),
              @Environment(key = "MYSQL_ALLOW_EMPTY_PASSWORD", value = "yes"),
              @Environment(key = "MYSQL_DATABASE", value = "jdbc_test_db"),
-             @Environment( key = "MYSQL_ROOT_HOST", value = "172.17.0.1"),
          },
          waitFor = @WaitFor( value = "mysqld: ready for connections",timeoutInMillis = 30000),
          newForEachCase = false

extensions/entitystore-sqlkv/src/test/java/org/apache/polygene/entitystore/sqlkv/MariaDbEntityStoreTestSuite.java

@@ -34,14 +34,12 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Disabled;
 
-@Disabled( "Waiting response from JOOQ to fix SQL generation. VARCHAR instead of CHAR")
 @Docker( image = "org.apache.polygene:org.apache.polygene.internal.docker-mariadb",
          ports = @Port( exposed = 8801, inner = 3306),
          environments = {
              @Environment( key = "MYSQL_ROOT_PASSWORD", value = ""),
              @Environment(key = "MYSQL_ALLOW_EMPTY_PASSWORD", value = "yes"),
              @Environment(key = "MYSQL_DATABASE", value = "jdbc_test_db"),
-             @Environment( key = "MYSQL_ROOT_HOST", value = "172.17.0.1"),
          },
          waitFor = @WaitFor( value = "mysqld: ready for connections", timeoutInMillis = 30000),
          newForEachCase = false