Skip to content

Commit c8d29fd

Browse files
quaffmhalbritter
authored andcommitted
Create service connections for image with registry host and without project
See gh-46974 Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
1 parent fafd0bb commit c8d29fd

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/ConnectionNamePredicate.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
* {@link Predicate} that matches against connection name.
3030
*
3131
* @author Phillip Webb
32+
* @author Yanming Zhou
3233
*/
3334
class ConnectionNamePredicate implements Predicate<DockerComposeConnectionSource> {
3435

@@ -47,7 +48,7 @@ public boolean test(DockerComposeConnectionSource source) {
4748

4849
private String getActual(RunningService service) {
4950
String label = service.labels().get("org.springframework.boot.service-connection");
50-
return (label != null) ? asCanonicalName(label) : service.image().getName();
51+
return asCanonicalName((label != null) ? label : service.image().getName());
5152
}
5253

5354
private String asCanonicalName(String name) {

spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/ConnectionNamePredicateTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
* Tests for {@link ConnectionNamePredicate}.
3333
*
3434
* @author Phillip Webb
35+
* @author Yanming Zhou
3536
*/
3637
class ConnectionNamePredicateTests {
3738

@@ -63,7 +64,7 @@ void customDomain() {
6364
assertThat(predicateOf("redis")).accepts(sourceOf("internalhost:8080/library/redis"));
6465
assertThat(predicateOf("redis")).accepts(sourceOf("myhost.com/library/redis"));
6566
assertThat(predicateOf("redis")).accepts(sourceOf("myhost.com:8080/library/redis"));
66-
assertThat(predicateOf("redis")).rejects(sourceOf("internalhost:8080/redis"));
67+
assertThat(predicateOf("redis")).accepts(sourceOf("internalhost:8080/redis"));
6768
}
6869

6970
@Test

0 commit comments

Comments
 (0)