Skip to content

Commit 7d96789

Browse files
Fix Bitnami MongoDB environment variables for Docker Compose
Fixes gh-41097
1 parent 4e3d1a6 commit 7d96789

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ class MongoEnvironment {
4141
"MONGO_INITDB_ROOT_USERNAME_FILE is not supported");
4242
Assert.state(!env.containsKey("MONGO_INITDB_ROOT_PASSWORD_FILE"),
4343
"MONGO_INITDB_ROOT_PASSWORD_FILE is not supported");
44-
this.username = env.getOrDefault("MONGO_INITDB_ROOT_USERNAME", env.get("MONGO_ROOT_USERNAME"));
45-
this.password = env.getOrDefault("MONGO_INITDB_ROOT_PASSWORD", env.get("MONGO_ROOT_PASSWORD"));
46-
this.database = env.get("MONGO_INITDB_DATABASE");
44+
this.username = env.getOrDefault("MONGO_INITDB_ROOT_USERNAME", env.get("MONGODB_ROOT_USERNAME"));
45+
this.password = env.getOrDefault("MONGO_INITDB_ROOT_PASSWORD", env.get("MONGODB_ROOT_PASSWORD"));
46+
this.database = env.getOrDefault("MONGO_INITDB_DATABASE", env.get("MONGODB_DATABASE"));
4747
}
4848

4949
String getUsername() {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ void runCreatesConnectionDetails() {
4646
assertThat(connectionString.getCredential().getUserName()).isEqualTo("root");
4747
assertThat(connectionString.getCredential().getPassword()).isEqualTo("secret".toCharArray());
4848
assertThat(connectionString.getCredential().getSource()).isEqualTo("admin");
49-
assertThat(connectionString.getDatabase()).isEqualTo("test");
49+
assertThat(connectionString.getDatabase()).isEqualTo("testdb");
5050
assertThat(connectionDetails.getGridFs()).isNull();
5151
}
5252

spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/mongo/mongo-bitnami-compose.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ services:
44
ports:
55
- '27017'
66
environment:
7-
- 'MONGO_ROOT_USERNAME=root'
8-
- 'MONGO_ROOT_PASSWORD=secret'
7+
- 'MONGODB_ROOT_USERNAME=root'
8+
- 'MONGODB_ROOT_PASSWORD=secret'
9+
- 'MONGODB_DATABASE=testdb'

0 commit comments

Comments
 (0)