Skip to content

GEODE-10459: upgrade testcontainers from 1.17.6 to 1.21.3 #7916

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JinwooHwang merged 2 commits into from
Aug 27, 2025
Merged

GEODE-10459: upgrade testcontainers from 1.17.6 to 1.21.3 #7916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe36834
GEODE-10459: upgrade testcontainers
raboof Aug 27, 2025
db28f8e
Change DockerComposeContainer to ComposeContainer
raboof Aug 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...y-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ class DependencyConstraints {
api(group: 'org.springframework.hateoas', name: 'spring-hateoas', version: '1.5.0')
api(group: 'org.springframework.ldap', name: 'spring-ldap-core', version: '2.4.0')
api(group: 'org.springframework.shell', name: 'spring-shell', version: get('springshell.version'))
api(group: 'org.testcontainers', name: 'testcontainers', version: '1.17.6')
api(group: 'org.testcontainers', name: 'testcontainers', version: '1.21.3')
api(group: 'pl.pragmatists', name: 'JUnitParams', version: '1.1.0')
api(group: 'xerces', name: 'xercesImpl', version: '2.12.0')
api(group: 'xml-apis', name: 'xml-apis', version: '1.4.01')
Expand Down
20 changes: 10 additions & 10 deletions geode-assembly/src/acceptanceTest/java/org/apache/geode/rules/DockerComposeRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
import org.testcontainers.DockerClientFactory;
import org.testcontainers.containers.ComposeContainer;
import org.testcontainers.containers.Container;
import org.testcontainers.containers.ContainerState;
import org.testcontainers.containers.DockerComposeContainer;
import org.testcontainers.containers.output.BaseConsumer;
import org.testcontainers.containers.output.FrameConsumerResultCallback;
import org.testcontainers.containers.output.OutputFrame;
Expand Down Expand Up @@ -77,7 +77,7 @@ public class DockerComposeRule extends ExternalResource {
private final RuleChain delegate;
private final String composeFile;
private final Map<String, List<Integer>> exposedServices;
private DockerComposeContainer<?> composeContainer;
private ComposeContainer composeContainer;

public DockerComposeRule(String composeFile, Map<String, List<Integer>> exposedServices) {
this.composeFile = composeFile;
Expand All @@ -94,7 +94,7 @@ public Statement apply(Statement base, Description description) {
@Override
public void evaluate() throws Throwable {

composeContainer = new DockerComposeContainer<>("compose", new File(composeFile));
composeContainer = new ComposeContainer("compose", new File(composeFile));
exposedServices.forEach((service, ports) -> ports
.forEach(p -> composeContainer.withExposedService(service, p)));
composeContainer.withLocalCompose(true);
Expand All @@ -116,7 +116,7 @@ public void evaluate() throws Throwable {
* When used with compose, testcontainers does not allow one to have a 'container_name'
* attribute in the compose file. This means that container names end up looking something like:
* {@code project_service_index}. When a container performs a reverse IP lookup it will get a
* hostname that looks something like {@code projectjkh_db_1.my-network}. This can be a problem
* hostname that looks something like {@code projectjkh-db-1.my-network}. This can be a problem
* since this hostname is not RFC compliant as it contains underscores. This may cause problems
* in particular with SSL.
*
Expand All @@ -126,7 +126,7 @@ public void evaluate() throws Throwable {
* @throws IllegalArgumentException if the service cannot be found
*/
public void setContainerName(String serviceName, String newName) {
ContainerState container = composeContainer.getContainerByServiceName(serviceName + "_1")
ContainerState container = composeContainer.getContainerByServiceName(serviceName + "-1")
.orElseThrow(() -> new IllegalArgumentException("Unknown service name: " + serviceName));

String containerId = container.getContainerId();
Expand All @@ -141,7 +141,7 @@ public void setContainerName(String serviceName, String newName) {
* @return the stdout of the container if the command was successful, else the stderr
*/
public String execForService(String serviceName, String... command) {
ContainerState container = composeContainer.getContainerByServiceName(serviceName + "_1")
ContainerState container = composeContainer.getContainerByServiceName(serviceName + "-1")
.orElseThrow(() -> new IllegalArgumentException("Unknown service name: " + serviceName));
Container.ExecResult result;
try {
Expand All @@ -159,7 +159,7 @@ public String execForService(String serviceName, String... command) {
* @return the exit code of the command
*/
public Long loggingExecForService(String serviceName, String... command) {
ContainerState container = composeContainer.getContainerByServiceName(serviceName + "_1")
ContainerState container = composeContainer.getContainerByServiceName(serviceName + "-1")
.orElseThrow(() -> new IllegalArgumentException("Unknown service name: " + serviceName));

String containerId = container.getContainerId();
Expand Down Expand Up @@ -208,7 +208,7 @@ public Integer getExternalPortForService(String serviceName, int port) {
* @return the ip address
*/
public String getIpAddressForService(String serviceName, String network) {
Map networks = composeContainer.getContainerByServiceName(serviceName + "_1").get()
Map networks = composeContainer.getContainerByServiceName(serviceName + "-1").get()
.getCurrentContainerInfo().getNetworkSettings().getNetworks();
for (Object object : networks.entrySet()) {
String key = (String) ((Map.Entry<?, ?>) object).getKey();
Expand All @@ -229,7 +229,7 @@ public String getIpAddressForService(String serviceName, String network) {
* @param serviceName the service to pause
*/
public void pauseService(String serviceName) {
ContainerState container = composeContainer.getContainerByServiceName(serviceName + "_1")
ContainerState container = composeContainer.getContainerByServiceName(serviceName + "-1")
.orElseThrow(() -> new IllegalArgumentException("Unknown service name: " + serviceName));
DockerClientFactory.instance().client().pauseContainerCmd(container.getContainerId()).exec();
}
Expand All @@ -240,7 +240,7 @@ public void pauseService(String serviceName) {
* @param serviceName the service to unpause
*/
public void unpauseService(String serviceName) {
ContainerState container = composeContainer.getContainerByServiceName(serviceName + "_1")
ContainerState container = composeContainer.getContainerByServiceName(serviceName + "-1")
.orElseThrow(() -> new IllegalArgumentException("Unknown service name: " + serviceName));
DockerClientFactory.instance().client().unpauseContainerCmd(container.getContainerId()).exec();
}
Expand Down
Loading