Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add Docker compose support for Postgres

Browse Source
This commit is contained in:
P0nk
2023-02-24 22:41:04 +01:00
parent f1192279bf
commit 8bb825ef02
6 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/database/migration/FlywayRunner.java
View File

@@ -16,6 +16,8 @@ public class FlywayRunner {
.dataSource(dbConfig.getJdbcUrl(), dbConfig.adminUsername(), dbConfig.adminPassword())
.schemas(dbConfig.schema())
.createSchemas(true)
.connectRetries(10)
.connectRetriesInterval(5)
.load();
flyway.migrate();
}

6
src/main/java/net/server/Server.java
View File

@@ -935,8 +935,12 @@ public class Server {
private PgDatabaseConfig readPgDbConfig() {
final ServerConfig serverConfig = YamlConfig.config.server;
String pgDbHost = System.getenv("PG_DB_HOST");
if (pgDbHost == null) {
pgDbHost = serverConfig.PG_DB_HOST;
}
return new PgDatabaseConfig(
serverConfig.PG_DB_NAME, serverConfig.PG_DB_HOST, serverConfig.PG_DB_SCHEMA,
serverConfig.PG_DB_NAME, pgDbHost, serverConfig.PG_DB_SCHEMA,
serverConfig.PG_DB_ADMIN_USERNAME, serverConfig.PG_DB_ADMIN_PASSWORD,
serverConfig.PG_DB_USERNAME, serverConfig.PG_DB_PASSWORD,
Duration.ofSeconds(serverConfig.INIT_CONNECTION_POOL_TIMEOUT)