Spring/spring-boot-data-geode
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor the TestcontainersCassandraConfiguration to again use the Testcontainers 'TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX' environment variable.

Browse Source
This commit is contained in:
John Blum
2023-05-12 15:51:28 -07:00
parent d2effd71e9
commit 02f5acb032
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-geode-project/spring-geode/src/test/java/example/app/crm/config/TestcontainersCassandraConfiguration.java
View File

@@ -67,6 +67,7 @@ import example.app.crm.model.Customer;
public class TestcontainersCassandraConfiguration extends TestCassandraConfiguration {
// Apache Cassandra Constants
private static final String CASSANDRA_VERSION = "3.11.15";
private static final String LOCAL_DATACENTER_NAME = "datacenter1";
// Testcontainers Constants
@@ -77,7 +78,9 @@ public class TestcontainersCassandraConfiguration extends TestCassandraConfigura
//private static final DockerImageName CASSANDRA_DOCKER_IMAGE_NAME = DockerImageName.parse("cassandra:latest");
private static final DockerImageName CASSANDRA_DOCKER_IMAGE_NAME =
DockerImageName.parse(String.format("%scassandra:3.11.15", TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX));
DockerImageName.parse(String.format("cassandra:%s", CASSANDRA_VERSION));
//private static final DockerImageName CASSANDRA_DOCKER_IMAGE_NAME =
// DockerImageName.parse(String.format("%scassandra:3.11.15", TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX));
private final Logger logger = LoggerFactory.getLogger(getClass());
@@ -166,8 +169,8 @@ public class TestcontainersCassandraConfiguration extends TestCassandraConfigura
return isNotJenkinsEnvironment()
? cassandraContainer.withEnv("TESTCONTAINERS_RYUK_DISABLED", TESTCONTAINERS_RYUK_DISABLED)
//: cassandraContainer.withEnv("TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX", TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX)
: cassandraContainer;
: cassandraContainer.withEnv("TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX", TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX);
//: cassandraContainer;
}
private @NonNull GenericContainer<?> withCassandraServer(@NonNull GenericContainer<?> cassandraContainer,