Browse Source

Create service connections for image with registry host and without project

See gh-46974

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
pull/47304/head
Yanming Zhou 4 months ago committed by Moritz Halbritter
parent
commit
c8d29fd3fe
  1. 3
      spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/ConnectionNamePredicate.java
  2. 3
      spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/ConnectionNamePredicateTests.java

3
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; @@ -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 @@ -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) {

3
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; @@ -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 { @@ -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

Loading…
Cancel
Save