spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 20:19:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.5.x' into 4.0.x

Browse Source 
Closes gh-49426
This commit is contained in:
Andy Wilkinson
2026-03-05 11:00:44 +00:00
parent 09ed319596 bb65863891
commit 9e2d446dfe
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/spring-boot-docker-compose/build.gradle
+2
View File
@@ -32,6 +32,8 @@ dependencies {
dockerTestImplementation(project(":test-support:spring-boot-docker-test-support"))
dockerTestRuntimeOnly("org.testcontainers:testcontainers")
testImplementation(project(":core:spring-boot-test"))
testImplementation(project(":test-support:spring-boot-test-support"))
testImplementation("ch.qos.logback:logback-classic")
test-support/spring-boot-docker-test-support/src/main/java/org/springframework/boot/testsupport/container/DisabledIfDockerUnavailableCondition.java
+8
View File
@@ -21,6 +21,9 @@ import org.junit.jupiter.api.extension.ExecutionCondition;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.testcontainers.DockerClientFactory;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
/**
* An {@link ExecutionCondition} that disables execution if Docker is unavailable.
*
@@ -30,12 +33,17 @@ import org.testcontainers.DockerClientFactory;
*/
class DisabledIfDockerUnavailableCondition implements ExecutionCondition {
private static final boolean TESTCONTAINERS_PRESENT = ClassUtils.isPresent("org.testcontainers.DockerClientFactory",
DisabledIfDockerUnavailableCondition.class.getClassLoader());
private static final String SILENCE_PROPERTY = "visibleassertions.silence";
private static final ConditionEvaluationResult ENABLED = ConditionEvaluationResult.enabled("Docker available");
@Override
public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
Assert.isTrue(TESTCONTAINERS_PRESENT, "Testcontainers is required when using @DisabledIfDockerUnavailable."
+ " Add a dependency on org.testcontainers:testcontainers");
String originalSilenceValue = System.getProperty(SILENCE_PROPERTY);
try {
DockerClientFactory.instance().client();