From c8d29fd3fe17ea191f5bfa8ba0745b837a5fc2ff Mon Sep 17 00:00:00 2001
From: Yanming Zhou <zhouyanming@gmail.com>
Date: Thu, 28 Aug 2025 10:31:33 +0800
Subject: [PATCH 1/2] Create service connections for image with registry host
 and without project

See gh-46974

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
---
 .../compose/service/connection/ConnectionNamePredicate.java    | 3 ++-
 .../service/connection/ConnectionNamePredicateTests.java       | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/ConnectionNamePredicate.java b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/ConnectionNamePredicate.java
index 31141554a47..f68de5489f8 100644
--- a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/ConnectionNamePredicate.java
+++ b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/ConnectionNamePredicate.java
@@ -29,6 +29,7 @@ import org.springframework.util.Assert;
  * {@link Predicate} that matches against connection name.
  *
  * @author Phillip Webb
+ * @author Yanming Zhou
  */
 class ConnectionNamePredicate implements Predicate<DockerComposeConnectionSource> {
 
@@ -47,7 +48,7 @@ class ConnectionNamePredicate implements Predicate<DockerComposeConnectionSource
 
 	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/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/ConnectionNamePredicateTests.java b/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/ConnectionNamePredicateTests.java
index bc527a4747a..3209a5aa2c6 100644
--- a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/ConnectionNamePredicateTests.java
+++ b/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/ConnectionNamePredicateTests.java
@@ -32,6 +32,7 @@ import static org.mockito.Mockito.mock;
  * Tests for {@link ConnectionNamePredicate}.
  *
  * @author Phillip Webb
+ * @author Yanming Zhou
  */
 class ConnectionNamePredicateTests {
 
@@ -63,7 +64,7 @@ class ConnectionNamePredicateTests {
 		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

From a6afc3995688b59a9ca71a5916abcf43d51f4d14 Mon Sep 17 00:00:00 2001
From: Moritz Halbritter <moritz.halbritter@broadcom.com>
Date: Tue, 2 Sep 2025 14:33:48 +0200
Subject: [PATCH 2/2] Polish "Create service connections for image with
 registry host and without project"

See gh-46974
---
 .../service/connection/ConnectionNamePredicateTests.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/ConnectionNamePredicateTests.java b/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/ConnectionNamePredicateTests.java
index 3209a5aa2c6..4050f17f06d 100644
--- a/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/ConnectionNamePredicateTests.java
+++ b/spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/ConnectionNamePredicateTests.java
@@ -61,10 +61,15 @@ class ConnectionNamePredicateTests {
 
 	@Test
 	void customDomain() {
+		assertThat(predicateOf("redis")).accepts(sourceOf("internalhost:8080/redis"));
 		assertThat(predicateOf("redis")).accepts(sourceOf("internalhost:8080/library/redis"));
+		assertThat(predicateOf("redis")).accepts(sourceOf("myhost.com/redis"));
 		assertThat(predicateOf("redis")).accepts(sourceOf("myhost.com/library/redis"));
 		assertThat(predicateOf("redis")).accepts(sourceOf("myhost.com:8080/library/redis"));
-		assertThat(predicateOf("redis")).accepts(sourceOf("internalhost:8080/redis"));
+		assertThat(predicateOf("openzipkin/zipkin")).rejects(sourceOf("myhost.com:8080/zipkin"));
+		assertThat(predicateOf("openzipkin/zipkin")).rejects(sourceOf("myhost.com:8080/library/zipkin"));
+		assertThat(predicateOf("openzipkin/zipkin")).accepts(sourceOf("myhost.com:8080/openzipkin/zipkin"));
+		assertThat(predicateOf("postgres")).accepts(sourceOf("docker.my-company.com/postgres:latest"));
 	}
 
 	@Test