Fix Bitnami MongoDB environment variables for Docker Compose

Fixes spring-projectsgh-41097
kse-music · Jun 13, 2024 · 7d96789 · 7d96789
1 parent 4e3d1a6
commit 7d96789
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/...va/org/springframework/boot/docker/compose/service/connection/mongo/MongoEnvironment.java b/...va/org/springframework/boot/docker/compose/service/connection/mongo/MongoEnvironment.java
@@ -41,9 +41,9 @@ class MongoEnvironment {
 				"MONGO_INITDB_ROOT_USERNAME_FILE is not supported");
 		Assert.state(!env.containsKey("MONGO_INITDB_ROOT_PASSWORD_FILE"),
 				"MONGO_INITDB_ROOT_PASSWORD_FILE is not supported");
-		this.username = env.getOrDefault("MONGO_INITDB_ROOT_USERNAME", env.get("MONGO_ROOT_USERNAME"));
-		this.password = env.getOrDefault("MONGO_INITDB_ROOT_PASSWORD", env.get("MONGO_ROOT_PASSWORD"));
-		this.database = env.get("MONGO_INITDB_DATABASE");
+		this.username = env.getOrDefault("MONGO_INITDB_ROOT_USERNAME", env.get("MONGODB_ROOT_USERNAME"));
+		this.password = env.getOrDefault("MONGO_INITDB_ROOT_PASSWORD", env.get("MONGODB_ROOT_PASSWORD"));
+		this.database = env.getOrDefault("MONGO_INITDB_DATABASE", env.get("MONGODB_DATABASE"));
 	}
 
 	String getUsername() {

diff --git a/...e/connection/mongo/MongoBitnamiDockerComposeConnectionDetailsFactoryIntegrationTests.java b/...e/connection/mongo/MongoBitnamiDockerComposeConnectionDetailsFactoryIntegrationTests.java
@@ -46,7 +46,7 @@ void runCreatesConnectionDetails() {
 		assertThat(connectionString.getCredential().getUserName()).isEqualTo("root");
 		assertThat(connectionString.getCredential().getPassword()).isEqualTo("secret".toCharArray());
 		assertThat(connectionString.getCredential().getSource()).isEqualTo("admin");
-		assertThat(connectionString.getDatabase()).isEqualTo("test");
+		assertThat(connectionString.getDatabase()).isEqualTo("testdb");
 		assertThat(connectionDetails.getGridFs()).isNull();
 	}
 

diff --git a/...g/springframework/boot/docker/compose/service/connection/mongo/mongo-bitnami-compose.yaml b/...g/springframework/boot/docker/compose/service/connection/mongo/mongo-bitnami-compose.yaml
@@ -4,5 +4,6 @@ services:
     ports:
       - '27017'
     environment:
-      - 'MONGO_ROOT_USERNAME=root'
-      - 'MONGO_ROOT_PASSWORD=secret'
+      - 'MONGODB_ROOT_USERNAME=root'
+      - 'MONGODB_ROOT_PASSWORD=secret'
+      - 'MONGODB_DATABASE=testdb'