From b9b205feff92d177f326b003d3c29560d35993ee Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Tue, 1 Nov 2022 13:49:48 -0400 Subject: [PATCH] TestContainers Compatibility, Version --- build.gradle | 2 +- .../amqp/rabbit/junit/AbstractTestContainerTests.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 1dce8098..5e0f6687 100644 --- a/build.gradle +++ b/build.gradle @@ -67,7 +67,7 @@ ext { springDataVersion = '2022.0.0-RC1' springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-RC1' springRetryVersion = '2.0.0-RC1' - testContainersVersion = '1.17.3' + testContainersVersion = '1.17.5' zstdJniVersion = '1.5.0-2' } diff --git a/spring-rabbit-junit/src/main/java/org/springframework/amqp/rabbit/junit/AbstractTestContainerTests.java b/spring-rabbit-junit/src/main/java/org/springframework/amqp/rabbit/junit/AbstractTestContainerTests.java index 7504a465..12c49e63 100644 --- a/spring-rabbit-junit/src/main/java/org/springframework/amqp/rabbit/junit/AbstractTestContainerTests.java +++ b/spring-rabbit-junit/src/main/java/org/springframework/amqp/rabbit/junit/AbstractTestContainerTests.java @@ -19,6 +19,7 @@ package org.springframework.amqp.rabbit.junit; import java.time.Duration; import org.testcontainers.containers.RabbitMQContainer; +import org.testcontainers.utility.DockerImageName; /** * @author Gary Russell @@ -37,7 +38,9 @@ public abstract class AbstractTestContainerTests { if (cache != null) { image = cache + image; } - RABBITMQ = new RabbitMQContainer(image) + DockerImageName imageName = DockerImageName.parse(image) + .asCompatibleSubstituteFor("rabbitmq"); + RABBITMQ = new RabbitMQContainer(imageName) .withExposedPorts(5672, 15672, 5552) .withPluginsEnabled("rabbitmq_stream") .withStartupTimeout(Duration.ofMinutes(2));