Merge branch '3.5.x'

Closes gh-47020

core/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) {

core/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 {
 
@@ -60,11 +61,16 @@ 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")).rejects(sourceOf("internalhost:8080/redis"));
 		assertThat(predicateOf("redis")).accepts(sourceOf("docker.my-company.com/library/redis:latest"));
+		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