Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-08-29 03:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.1.x'

Browse Source 
Closes gh-38048
This commit is contained in:
Phillip Webb 2023-10-25 12:37:41 -07:00
commit 464523ac04
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/testcontainers/atdevelopmenttime/devtools/MyContainersConfiguration.java
View File

@ -20,6 +20,7 @@ import org.testcontainers.containers.MongoDBContainer;
import org.springframework.boot.devtools.restart.RestartScope; import org.springframework.boot.devtools.restart.RestartScope;
import org.springframework.boot.test.context.TestConfiguration; import org.springframework.boot.test.context.TestConfiguration;
import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
@TestConfiguration(proxyBeanMethods = false) @TestConfiguration(proxyBeanMethods = false)
@ -27,6 +28,7 @@ public class MyContainersConfiguration {
@Bean @Bean
@RestartScope @RestartScope
@ServiceConnection
public MongoDBContainer mongoDbContainer() { public MongoDBContainer mongoDbContainer() {
return new MongoDBContainer("mongo:5.0"); return new MongoDBContainer("mongo:5.0");
} }

2
spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/testing/testcontainers/atdevelopmenttime/devtools/MyContainersConfiguration.kt
View File

@ -17,6 +17,7 @@ package org.springframework.boot.docs.features.testing.testcontainers.atdevelopm
import org.springframework.boot.devtools.restart.RestartScope import org.springframework.boot.devtools.restart.RestartScope
import org.springframework.boot.test.context.TestConfiguration import org.springframework.boot.test.context.TestConfiguration
import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Bean
import org.testcontainers.containers.MongoDBContainer import org.testcontainers.containers.MongoDBContainer
@ -25,6 +26,7 @@ class MyContainersConfiguration {
@Bean @Bean
@RestartScope @RestartScope
@ServiceConnection
fun monogDbContainer(): MongoDBContainer { fun monogDbContainer(): MongoDBContainer {
return MongoDBContainer("mongo:5.0") return MongoDBContainer("mongo:5.0")
} }