#181 add support for using custom docker images

Author: tomix26

embedded-database-spring-test/src/main/java/io/zonky/test/db/provider/mariadb/DockerMariaDBDatabaseProvider.java

@@ -25,20 +25,22 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.util.concurrent.UncheckedExecutionException;
 import io.zonky.test.db.preparer.DatabasePreparer;
-import io.zonky.test.db.provider.support.BlockingDatabaseWrapper;
 import io.zonky.test.db.provider.DatabaseProvider;
 import io.zonky.test.db.provider.EmbeddedDatabase;
 import io.zonky.test.db.provider.ProviderException;
+import io.zonky.test.db.provider.support.BlockingDatabaseWrapper;
 import io.zonky.test.db.util.PropertyUtils;
 import org.mariadb.jdbc.MariaDbDataSource;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanWrapper;
 import org.springframework.beans.BeanWrapperImpl;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.core.env.Environment;
+import org.springframework.util.ClassUtils;
 import org.testcontainers.containers.Container.ExecResult;
 import org.testcontainers.containers.MariaDBContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
+import org.testcontainers.utility.DockerImageName;
 
 import javax.sql.DataSource;
 import java.sql.Connection;
@@ -142,7 +144,7 @@ protected static class DatabaseInstance {
 
         private DatabaseInstance(DatabaseConfig config, DatabasePool pool) {
             databasePool = pool;
-            container = new MariaDBContainer(config.dockerImage);
+            container = createContainer(config.dockerImage);
 
             if (config.tmpfsEnabled) {
                 Consumer<CreateContainerCmd> consumer = cmd -> cmd.getHostConfig()
@@ -161,6 +163,14 @@ private DatabaseInstance(DatabaseConfig config, DatabasePool pool) {
             semaphore = new Semaphore(150);
         }
 
+        private MariaDBContainer createContainer(String dockerImage) {
+            if (ClassUtils.hasMethod(DockerImageName.class, "asCompatibleSubstituteFor", String.class)) {
+                return new MariaDBContainer(DockerImageName.parse(dockerImage).asCompatibleSubstituteFor("mariadb"));
+            } else {
+                return new MariaDBContainer(dockerImage);
+            }
+        }
+
         public EmbeddedDatabase createDatabase(ClientConfig config, DatabasePreparer preparer) throws SQLException {
             String databaseName = container.getDatabaseName();
             executeStatement(config, String.format("CREATE DATABASE IF NOT EXISTS %s", databaseName));

embedded-database-spring-test/src/main/java/io/zonky/test/db/provider/mssql/DockerMSSQLDatabaseProvider.java

@@ -41,8 +41,10 @@
 import org.springframework.beans.BeanWrapperImpl;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.core.env.Environment;
+import org.springframework.util.ClassUtils;
 import org.testcontainers.containers.MSSQLServerContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
+import org.testcontainers.utility.DockerImageName;
 
 import javax.sql.DataSource;
 import java.sql.Connection;
@@ -129,7 +131,7 @@ protected static class DatabaseInstance {
         private final Semaphore semaphore;
 
         private DatabaseInstance(DatabaseConfig config) {
-            container = new MSSQLServerContainer(config.dockerImage);
+            container = createContainer(config.dockerImage);
             config.customizers.forEach(c -> c.customize(container));
 
             container.start();
@@ -138,6 +140,14 @@ private DatabaseInstance(DatabaseConfig config) {
             semaphore = new Semaphore(32767);
         }
 
+        private MSSQLServerContainer createContainer(String dockerImage) {
+            if (ClassUtils.hasMethod(DockerImageName.class, "asCompatibleSubstituteFor", String.class)) {
+                return new MSSQLServerContainer(DockerImageName.parse(dockerImage).asCompatibleSubstituteFor("mcr.microsoft.com/mssql/server"));
+            } else {
+                return new MSSQLServerContainer(dockerImage);
+            }
+        }
+
         public EmbeddedDatabase createDatabase(ClientConfig config, DatabaseRequest request) throws SQLException {
             DatabaseTemplate template = request.getTemplate();
             DatabasePreparer preparer = request.getPreparer();

embedded-database-spring-test/src/main/java/io/zonky/test/db/provider/mysql/DockerMySQLDatabaseProvider.java

@@ -26,19 +26,21 @@
 import com.google.common.util.concurrent.UncheckedExecutionException;
 import com.mysql.cj.jdbc.MysqlDataSource;
 import io.zonky.test.db.preparer.DatabasePreparer;
-import io.zonky.test.db.provider.support.BlockingDatabaseWrapper;
 import io.zonky.test.db.provider.DatabaseProvider;
 import io.zonky.test.db.provider.EmbeddedDatabase;
 import io.zonky.test.db.provider.ProviderException;
+import io.zonky.test.db.provider.support.BlockingDatabaseWrapper;
 import io.zonky.test.db.util.PropertyUtils;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanWrapper;
 import org.springframework.beans.BeanWrapperImpl;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.core.env.Environment;
+import org.springframework.util.ClassUtils;
 import org.testcontainers.containers.Container.ExecResult;
 import org.testcontainers.containers.MySQLContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
+import org.testcontainers.utility.DockerImageName;
 
 import javax.sql.DataSource;
 import java.sql.Connection;
@@ -142,7 +144,7 @@ protected static class DatabaseInstance {
 
         private DatabaseInstance(DatabaseConfig config, DatabasePool pool) {
             databasePool = pool;
-            container = new MySQLContainer(config.dockerImage);
+            container = createContainer(config.dockerImage);
 
             if (config.tmpfsEnabled) {
                 Consumer<CreateContainerCmd> consumer = cmd -> cmd.getHostConfig()
@@ -161,6 +163,14 @@ private DatabaseInstance(DatabaseConfig config, DatabasePool pool) {
             semaphore = new Semaphore(150);
         }
 
+        private MySQLContainer createContainer(String dockerImage) {
+            if (ClassUtils.hasMethod(DockerImageName.class, "asCompatibleSubstituteFor", String.class)) {
+                return new MySQLContainer(DockerImageName.parse(dockerImage).asCompatibleSubstituteFor("mysql"));
+            } else {
+                return new MySQLContainer(dockerImage);
+            }
+        }
+
         public EmbeddedDatabase createDatabase(ClientConfig config, DatabasePreparer preparer) throws SQLException {
             String databaseName = container.getDatabaseName();
             executeStatement(config, String.format("CREATE DATABASE IF NOT EXISTS %s", databaseName));

embedded-database-spring-test/src/main/java/io/zonky/test/db/provider/postgres/DockerPostgresDatabaseProvider.java

@@ -154,7 +154,7 @@ private DatabaseInstance(DatabaseConfig config) {
                     .map(e -> String.format("-c %s=%s", e.getKey(), e.getValue()))
                     .collect(Collectors.joining(" "));
 
-            container = createPostgreSQLContainer(config.dockerImage, container -> {
+            container = createContainer(config.dockerImage, container -> {
                 container.addEnv("POSTGRES_INITDB_ARGS", "--nosync " + initdbArgs);
                 container.setCommand("postgres " + postgresArgs);
             });
@@ -176,7 +176,7 @@ private DatabaseInstance(DatabaseConfig config) {
             semaphore = new Semaphore(Integer.parseInt(serverProperties.get("max_connections")));
         }
 
-        private PostgreSQLContainer createPostgreSQLContainer(String dockerImage, Consumer<PostgreSQLContainer> configAction) {
+        private PostgreSQLContainer createContainer(String dockerImage, Consumer<PostgreSQLContainer> configAction) {
             if (ClassUtils.hasMethod(DockerImageName.class, "asCompatibleSubstituteFor", String.class)) {
                 return new PostgreSQLContainer(DockerImageName.parse(dockerImage).asCompatibleSubstituteFor("postgres")) {
                     @Override