From 85efb5f53cf8dc8acff18f6a00aeae2c0010228d Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 10 Nov 2021 17:19:41 -0500 Subject: [PATCH] Take Docker registry from the DOCKER_REGISTRY_URL Add a logic into the `TestUtils` to take a Docker registry URL from the `DOCKER_REGISTRY_URL` ENV variable. Use the value in the `GenericContainer` for image to pull. Fallback to an official registry if no value --- .../integration/mqtt/MosquittoContainerTest.java | 4 +++- .../org/springframework/integration/test/util/TestUtils.java | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MosquittoContainerTest.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MosquittoContainerTest.java index 2a3f7e2220..a074bb4fb4 100644 --- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MosquittoContainerTest.java +++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MosquittoContainerTest.java @@ -20,6 +20,8 @@ import org.testcontainers.containers.GenericContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +import org.springframework.integration.test.util.TestUtils; + /** * * @author Artem Bilan @@ -31,7 +33,7 @@ public interface MosquittoContainerTest { @Container GenericContainer MOSQUITTO_CONTAINER = - new GenericContainer<>("eclipse-mosquitto:2.0.12") + new GenericContainer<>(TestUtils.dockerRegistryFromEnv() + "eclipse-mosquitto:2.0.12") .withCommand("mosquitto -c /mosquitto-no-auth.conf") .withReuse(true) .withExposedPorts(1883); diff --git a/spring-integration-test-support/src/main/java/org/springframework/integration/test/util/TestUtils.java b/spring-integration-test-support/src/main/java/org/springframework/integration/test/util/TestUtils.java index f95a075e3e..d4ca636537 100644 --- a/spring-integration-test-support/src/main/java/org/springframework/integration/test/util/TestUtils.java +++ b/spring-integration-test-support/src/main/java/org/springframework/integration/test/util/TestUtils.java @@ -21,6 +21,7 @@ import java.lang.reflect.InvocationTargetException; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.Properties; import java.util.Set; import java.util.concurrent.ThreadPoolExecutor.CallerRunsPolicy; @@ -374,6 +375,10 @@ public abstract class TestUtils { ctx.updateLoggers(); } + public static String dockerRegistryFromEnv() { + return Optional.ofNullable(System.getenv("DOCKER_REGISTRY_URL")).orElse(""); + } + public static class LevelsContainer { private final Map, Level> classLevels;