From 0cafca2a5fd1ebd4e7ae78ab4b1a0df3a85cd57b Mon Sep 17 00:00:00 2001 From: Yanming Zhou Date: Thu, 28 Aug 2025 10:31:33 +0800 Subject: [PATCH] Create service connections for image with registry host and without project Fix GH-46971 Signed-off-by: Yanming Zhou --- .../compose/service/connection/ConnectionNamePredicate.java | 3 ++- .../service/connection/ConnectionNamePredicateTests.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/ConnectionNamePredicate.java b/core/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/ConnectionNamePredicate.java index b5a65f081a33..d3296939ad18 100644 --- a/core/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/ConnectionNamePredicate.java +++ b/core/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/ConnectionNamePredicate.java @@ -29,6 +29,7 @@ * {@link Predicate} that matches against connection name. * * @author Phillip Webb + * @author Yanming Zhou */ class ConnectionNamePredicate implements Predicate { @@ -47,7 +48,7 @@ public boolean test(DockerComposeConnectionSource source) { private String getActual(RunningService service) { String label = service.labels().get("org.springframework.boot.service-connection"); - return (label != null) ? asCanonicalName(label) : service.image().getName(); + return asCanonicalName((label != null) ? label : service.image().getName()); } private String asCanonicalName(String name) { diff --git a/core/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/ConnectionNamePredicateTests.java b/core/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/ConnectionNamePredicateTests.java index 5f43a861b233..b1bef39241c5 100644 --- a/core/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/ConnectionNamePredicateTests.java +++ b/core/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/ConnectionNamePredicateTests.java @@ -32,6 +32,7 @@ * Tests for {@link ConnectionNamePredicate}. * * @author Phillip Webb + * @author Yanming Zhou */ class ConnectionNamePredicateTests { @@ -63,7 +64,7 @@ void customDomain() { assertThat(predicateOf("redis")).accepts(sourceOf("internalhost:8080/library/redis")); assertThat(predicateOf("redis")).accepts(sourceOf("myhost.com/library/redis")); assertThat(predicateOf("redis")).accepts(sourceOf("myhost.com:8080/library/redis")); - assertThat(predicateOf("redis")).rejects(sourceOf("internalhost:8080/redis")); + assertThat(predicateOf("redis")).accepts(sourceOf("internalhost:8080/redis")); } @Test