This is an automated email from the ASF dual-hosted git repository.
zhonghongsheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new c9605e4165d Refactor : refactor the IT to support customized proxy
test image. (#20967)
c9605e4165d is described below
commit c9605e4165d1f5a5c6a8cbcffe0bba6139857a16
Author: 孙念君 Nianjun Sun <[email protected]>
AuthorDate: Tue Sep 20 16:25:56 2022 +0800
Refactor : refactor the IT to support customized proxy test image. (#20967)
* Add : add customized image for testing
* Refactor : rename the container image variable
* Refactor : refactor the way to get the IT proxy container image
* Refactor : change the default value for system property with an elegant
way
* Refactor : refactor some variables
* Add : add specific mysql config for composer
* Fix : fix the unused config variable after merge
---
.../config/AdaptorContainerConfiguration.java | 3 +--
.../ProxyClusterContainerConfigurationFactory.java | 3 ++-
.../impl/ShardingSphereProxyClusterContainer.java | 2 +-
.../ShardingSphereProxyStandaloneContainer.java | 2 +-
.../AdapterContainerUtil.java} | 30 +++++++++++-----------
.../env/container/atomic/util/ContainerUtil.java | 11 --------
.../ProxyClusterContainerConfigurationFactory.java | 3 ++-
...gProxyClusterContainerConfigurationFactory.java | 3 ++-
.../compose/mode/ClusterContainerComposer.java | 4 ++-
.../ProxyClusterContainerConfigurationFactory.java | 5 ++--
...oxyStandaloneContainerConfigurationFactory.java | 3 ++-
.../ProxyClusterContainerConfigurationFactory.java | 3 ++-
12 files changed, 34 insertions(+), 38 deletions(-)
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/config/AdaptorContainerConfiguration.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/config/AdaptorContainerConfiguration.java
index 3de49a61da3..8062600fdce 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/config/AdaptorContainerConfiguration.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/config/AdaptorContainerConfiguration.java
@@ -19,7 +19,6 @@ package
org.apache.shardingsphere.test.integration.env.container.atomic.adapter.
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.test.integration.env.container.atomic.util.ContainerUtil;
import java.util.Map;
@@ -34,5 +33,5 @@ public final class AdaptorContainerConfiguration {
private final Map<String, String> mountedResources;
- private final int containerId = ContainerUtil.generateAdaptorContainerId();
+ private final String adapterContainerImage;
}
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/config/ProxyClusterContainerConfigurationFactory.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/config/ProxyClusterContainerConfigurationFactory.java
index af6d8926e53..e90ecac7f0b 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/config/ProxyClusterContainerConfigurationFactory.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/config/ProxyClusterContainerConfigurationFactory.java
@@ -20,6 +20,7 @@ package
org.apache.shardingsphere.test.integration.env.container.atomic.adapter.
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import
org.apache.shardingsphere.test.integration.env.container.atomic.constants.ProxyContainerConstants;
+import
org.apache.shardingsphere.test.integration.env.container.atomic.util.AdapterContainerUtil;
import java.util.Collections;
import java.util.Map;
@@ -36,7 +37,7 @@ public final class ProxyClusterContainerConfigurationFactory {
* @return created instance
*/
public static AdaptorContainerConfiguration newInstance() {
- return new AdaptorContainerConfiguration("", getMountedResources());
+ return new AdaptorContainerConfiguration("", getMountedResources(),
AdapterContainerUtil.getAdapterContainerImage());
}
private static Map<String, String> getMountedResources() {
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/impl/ShardingSphereProxyClusterContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/impl/ShardingSphereProxyClusterContainer.java
index 340db81849d..258a74727cd 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/impl/ShardingSphereProxyClusterContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/impl/ShardingSphereProxyClusterContainer.java
@@ -46,7 +46,7 @@ public final class ShardingSphereProxyClusterContainer
extends DockerITContainer
private final AtomicReference<DataSource> targetDataSourceProvider = new
AtomicReference<>();
public ShardingSphereProxyClusterContainer(final DatabaseType
databaseType, final AdaptorContainerConfiguration config) {
- super(ProxyContainerConstants.PROXY_CONTAINER_NAME_PREFIX,
ProxyContainerConstants.PROXY_CONTAINER_IMAGE);
+ super(ProxyContainerConstants.PROXY_CONTAINER_NAME_PREFIX,
config.getAdapterContainerImage());
this.databaseType = databaseType;
this.config = config;
}
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/impl/ShardingSphereProxyStandaloneContainer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/impl/ShardingSphereProxyStandaloneContainer.java
index 2fa5aa255f3..f7f3041fca9 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/impl/ShardingSphereProxyStandaloneContainer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/impl/ShardingSphereProxyStandaloneContainer.java
@@ -48,7 +48,7 @@ public final class ShardingSphereProxyStandaloneContainer
extends DockerITContai
private final AtomicReference<DataSource> targetDataSourceProvider = new
AtomicReference<>();
public ShardingSphereProxyStandaloneContainer(final DatabaseType
databaseType, final AdaptorContainerConfiguration config) {
- super(ProxyContainerConstants.PROXY_CONTAINER_NAME_PREFIX,
ProxyContainerConstants.PROXY_CONTAINER_IMAGE);
+ super(ProxyContainerConstants.PROXY_CONTAINER_NAME_PREFIX,
config.getAdapterContainerImage());
this.databaseType = databaseType;
this.config = config;
}
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/config/AdaptorContainerConfiguration.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/util/AdapterContainerUtil.java
similarity index 65%
copy from
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/config/AdaptorContainerConfiguration.java
copy to
shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/util/AdapterContainerUtil.java
index 3de49a61da3..697c74294bf 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/adapter/config/AdaptorContainerConfiguration.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/util/AdapterContainerUtil.java
@@ -15,24 +15,24 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.test.integration.env.container.atomic.adapter.config;
+package org.apache.shardingsphere.test.integration.env.container.atomic.util;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.test.integration.env.container.atomic.util.ContainerUtil;
-
-import java.util.Map;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import
org.apache.shardingsphere.test.integration.env.container.atomic.constants.ProxyContainerConstants;
/**
- * Adaptor container configuration.
+ * Adapter Container Util.
*/
-@RequiredArgsConstructor
-@Getter
-public final class AdaptorContainerConfiguration {
-
- private final String proxyDataSourceName;
-
- private final Map<String, String> mountedResources;
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class AdapterContainerUtil {
- private final int containerId = ContainerUtil.generateAdaptorContainerId();
+ /**
+ * Get adapter container image.
+ *
+ * @return adapter container image
+ */
+ public static String getAdapterContainerImage() {
+ return System.getProperty("it.docker.proxy.image",
ProxyContainerConstants.PROXY_CONTAINER_IMAGE);
+ }
}
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/util/ContainerUtil.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/util/ContainerUtil.java
index 80f7bc63eb9..385e9c67ab4 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/util/ContainerUtil.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-env/src/test/java/org/apache/shardingsphere/test/integration/env/container/atomic/util/ContainerUtil.java
@@ -30,8 +30,6 @@ public final class ContainerUtil {
private static final AtomicInteger ATOMIC_MYSQL_SERVER_ID = new
AtomicInteger(1);
- private static final AtomicInteger ATOMIC_ADAPTOR_CONTAINER_ID = new
AtomicInteger(1);
-
private static final AtomicInteger ATOMIC_STORAGE_CONTAINER_ID = new
AtomicInteger(1);
/**
@@ -43,15 +41,6 @@ public final class ContainerUtil {
return ATOMIC_MYSQL_SERVER_ID.getAndIncrement();
}
- /**
- * Generate a unique adapter container id.
- *
- * @return unique adapter container id
- */
- public static int generateAdaptorContainerId() {
- return ATOMIC_ADAPTOR_CONTAINER_ID.getAndIncrement();
- }
-
/**
* Generate a unique storage container id.
*
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/framework/container/config/ProxyClusterContainerConfigurationFactory.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/framework/container/config/ProxyClusterContainerConfigurationFactory.java
index b3384899551..8cb68fa232e 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/framework/container/config/ProxyClusterContainerConfigurationFactory.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-ha/src/test/java/org/apache/shardingsphere/test/integration/ha/framework/container/config/ProxyClusterContainerConfigurationFactory.java
@@ -21,6 +21,7 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import
org.apache.shardingsphere.test.integration.env.container.atomic.adapter.config.AdaptorContainerConfiguration;
import
org.apache.shardingsphere.test.integration.env.container.atomic.constants.ProxyContainerConstants;
+import
org.apache.shardingsphere.test.integration.env.container.atomic.util.AdapterContainerUtil;
import java.util.HashMap;
import java.util.Map;
@@ -38,7 +39,7 @@ public final class ProxyClusterContainerConfigurationFactory {
* @return created instance
*/
public static AdaptorContainerConfiguration newInstance(final String
scenario) {
- return new AdaptorContainerConfiguration("",
getMountedResources(scenario));
+ return new AdaptorContainerConfiguration("",
getMountedResources(scenario), AdapterContainerUtil.getAdapterContainerImage());
}
private static Map<String, String> getMountedResources(final String
scenario) {
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/config/proxy/ScalingProxyClusterContainerConfigurationFactory.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/config/proxy/ScalingProxyClusterContainerConfigurationF
[...]
index e7facc54254..fcbca3ccb20 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/config/proxy/ScalingProxyClusterContainerConfigurationFactory.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/java/org/apache/shardingsphere/integration/data/pipeline/framework/container/config/proxy/ScalingProxyClusterContainerConfigurationFactory.java
@@ -23,6 +23,7 @@ import
org.apache.shardingsphere.infra.database.type.DatabaseType;
import
org.apache.shardingsphere.test.integration.env.container.atomic.adapter.config.AdaptorContainerConfiguration;
import
org.apache.shardingsphere.test.integration.env.container.atomic.adapter.config.ProxyClusterContainerConfigurationFactory;
import
org.apache.shardingsphere.test.integration.env.container.atomic.constants.ProxyContainerConstants;
+import
org.apache.shardingsphere.test.integration.env.container.atomic.util.AdapterContainerUtil;
import
org.apache.shardingsphere.test.integration.env.container.atomic.util.DatabaseTypeUtil;
import java.util.HashMap;
@@ -42,7 +43,7 @@ public final class
ScalingProxyClusterContainerConfigurationFactory {
* @return created instance
*/
public static AdaptorContainerConfiguration newInstance(final DatabaseType
databaseType, final String storageContainerImage) {
- return new
AdaptorContainerConfiguration(getProxyDatasourceName(databaseType),
getMountedResource(databaseType, storageContainerImage));
+ return new
AdaptorContainerConfiguration(getProxyDatasourceName(databaseType),
getMountedResource(databaseType, storageContainerImage),
AdapterContainerUtil.getAdapterContainerImage());
}
private static String getProxyDatasourceName(final DatabaseType
databaseType) {
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/mode/ClusterContainerComposer.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/mode/ClusterContainerComposer.java
index 97aa28e223e..d41a6a0e98f 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/mode/ClusterContainerComposer.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/compose/mode/ClusterContainerComposer.java
@@ -29,6 +29,7 @@ import
org.apache.shardingsphere.test.integration.env.container.atomic.governanc
import
org.apache.shardingsphere.test.integration.env.container.atomic.storage.StorageContainer;
import
org.apache.shardingsphere.test.integration.env.container.atomic.storage.StorageContainerFactory;
import
org.apache.shardingsphere.test.integration.env.container.atomic.storage.config.impl.StorageContainerConfigurationFactory;
+import
org.apache.shardingsphere.test.integration.env.container.atomic.util.AdapterContainerUtil;
import
org.apache.shardingsphere.test.integration.framework.param.model.ParameterizedArray;
import javax.sql.DataSource;
@@ -55,7 +56,8 @@ public final class ClusterContainerComposer implements
ContainerComposer {
// TODO add more version of databases
storageContainer =
containers.registerContainer(StorageContainerFactory.newInstance(parameterizedArray.getDatabaseType(),
"", scenario,
StorageContainerConfigurationFactory.newInstance(parameterizedArray.getDatabaseType())));
- AdaptorContainerConfiguration containerConfig =
ProxyClusterContainerConfigurationFactory.newInstance(scenario,
parameterizedArray.getDatabaseType());
+ AdaptorContainerConfiguration containerConfig =
ProxyClusterContainerConfigurationFactory.newInstance(
+ scenario, parameterizedArray.getDatabaseType(),
AdapterContainerUtil.getAdapterContainerImage());
AdapterContainer adapterContainer =
AdapterContainerFactory.newInstance(
parameterizedArray.getMode(), parameterizedArray.getAdapter(),
parameterizedArray.getDatabaseType(), storageContainer, scenario,
containerConfig);
if (adapterContainer instanceof DockerITContainer) {
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/config/ProxyClusterContainerConfigurationFactory.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/config/ProxyClusterContainerConfigurationFactory.java
index 8e72514bdff..96ec9c72a8d 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/config/ProxyClusterContainerConfigurationFactory.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/config/ProxyClusterContainerConfigurationFactory.java
@@ -36,10 +36,11 @@ public final class
ProxyClusterContainerConfigurationFactory {
*
* @param scenario scenario
* @param databaseType database type
+ * @param adapterContainerImage adapter container image
* @return created instance
*/
- public static AdaptorContainerConfiguration newInstance(final String
scenario, final DatabaseType databaseType) {
- return new AdaptorContainerConfiguration(scenario,
getMountedResources(scenario, databaseType));
+ public static AdaptorContainerConfiguration newInstance(final String
scenario, final DatabaseType databaseType, final String adapterContainerImage) {
+ return new AdaptorContainerConfiguration(scenario,
getMountedResources(scenario, databaseType), adapterContainerImage);
}
private static Map<String, String> getMountedResources(final String
scenario, final DatabaseType databaseType) {
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/config/ProxyStandaloneContainerConfigurationFactory.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/config/ProxyStandaloneContainerConfigurationFactory.java
index 7b20ee4bdab..79e409c2eb2 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/config/ProxyStandaloneContainerConfigurationFactory.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/container/config/ProxyStandaloneContainerConfigurationFactory.java
@@ -21,6 +21,7 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import
org.apache.shardingsphere.test.integration.env.container.atomic.adapter.config.AdaptorContainerConfiguration;
+import
org.apache.shardingsphere.test.integration.env.container.atomic.util.AdapterContainerUtil;
import java.util.HashMap;
import java.util.Map;
@@ -39,7 +40,7 @@ public final class
ProxyStandaloneContainerConfigurationFactory {
* @return created instance
*/
public static AdaptorContainerConfiguration newInstance(final String
scenario, final DatabaseType databaseType) {
- return new AdaptorContainerConfiguration(scenario,
getMountedResources(scenario, databaseType));
+ return new AdaptorContainerConfiguration(scenario,
getMountedResources(scenario, databaseType),
AdapterContainerUtil.getAdapterContainerImage());
}
private static Map<String, String> getMountedResources(final String
scenario, final DatabaseType databaseType) {
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/framework/container/config/proxy/ProxyClusterContainerConfigurationFactory.java
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/framework/container/config/proxy/ProxyClusterContainerConfigurationFactory.java
index d70a342e27b..ccc2dc54b6d 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/framework/container/config/proxy/ProxyClusterContainerConfigurationFactory.java
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/java/org/apache/shardingsphere/integration/transaction/framework/container/config/proxy/ProxyClusterContainerConfigurationFactory.java
@@ -22,6 +22,7 @@ import lombok.NoArgsConstructor;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import
org.apache.shardingsphere.test.integration.env.container.atomic.adapter.config.AdaptorContainerConfiguration;
import
org.apache.shardingsphere.test.integration.env.container.atomic.constants.ProxyContainerConstants;
+import
org.apache.shardingsphere.test.integration.env.container.atomic.util.AdapterContainerUtil;
import
org.apache.shardingsphere.test.integration.env.container.atomic.util.DatabaseTypeUtil;
import java.util.HashMap;
@@ -40,7 +41,7 @@ public final class ProxyClusterContainerConfigurationFactory {
* @return created instance
*/
public static AdaptorContainerConfiguration newInstance(final DatabaseType
databaseType) {
- return new
AdaptorContainerConfiguration(getProxyDatasourceName(databaseType),
getMountedResource(databaseType));
+ return new
AdaptorContainerConfiguration(getProxyDatasourceName(databaseType),
getMountedResource(databaseType),
AdapterContainerUtil.getAdapterContainerImage());
}
private static String getProxyDatasourceName(final DatabaseType
databaseType) {
