Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix handling of env vars in Bitnami's Postgres image

Browse Source 
See gh-43783

Signed-off-by: He Zean <realhezean@gmail.com>
This commit is contained in:
He Zean
2025-01-13 19:25:14 +08:00
committed by Andy Wilkinson
parent 42ecda25cc
commit c8f2fb0d94
5 changed files with 71 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/postgres/PostgresEnvironment.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2024 the original author or authors.
* Copyright 2012-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -28,9 +28,18 @@ import org.springframework.util.StringUtils;
* @author Andy Wilkinson
* @author Phillip Webb
* @author Scott Frederick
* @author He Zean
*/
class PostgresEnvironment {
private static final String[] USERNAME_KEYS = new String[] { "POSTGRES_USER", "POSTGRES_USERNAME",
"POSTGRESQL_USER", "POSTGRESQL_USERNAME" };
private static final String DEFAULT_USERNAME = "postgres";
private static final String[] DATABASE_KEYS = new String[] { "POSTGRES_DB", "POSTGRES_DATABASE",
"POSTGRESQL_DATABASE" };
private final String username;
private final String password;
@@ -38,9 +47,18 @@ class PostgresEnvironment {
private final String database;
PostgresEnvironment(Map<String, String> env) {
this.username = env.getOrDefault("POSTGRES_USER", env.getOrDefault("POSTGRESQL_USER", "postgres"));
this.username = extractUsername(env);
this.password = extractPassword(env);
this.database = env.getOrDefault("POSTGRES_DB", env.getOrDefault("POSTGRESQL_DB", this.username));
this.database = extractDatabase(env);
}
private String extractUsername(Map<String, String> env) {
for (String key : USERNAME_KEYS) {
if (env.containsKey(key)) {
return env.get(key);
}
}
return DEFAULT_USERNAME;
}
private String extractPassword(Map<String, String> env) {
@@ -49,6 +67,15 @@ class PostgresEnvironment {
return password;
}
private String extractDatabase(Map<String, String> env) {
for (String key : DATABASE_KEYS) {
if (env.containsKey(key)) {
return env.get(key);
}
}
return this.username;
}
String getUsername() {
return this.username;
}