From 8495ccced6427df72168d433080588b1f40ee431 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 24 Jan 2018 19:17:14 +1300 Subject: [PATCH] #1241 - ENH: Support using ebean_db system property to control docker container for testing --- src/main/java/io/ebean/PrimaryServer.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/io/ebean/PrimaryServer.java b/src/main/java/io/ebean/PrimaryServer.java index 9383e5c7f..d139186bf 100644 --- a/src/main/java/io/ebean/PrimaryServer.java +++ b/src/main/java/io/ebean/PrimaryServer.java @@ -59,6 +59,7 @@ class PrimaryServer { private static String determineDefaultServerName() { String defaultServerName = System.getenv("EBEAN_DB"); + defaultServerName = System.getProperty("ebean_db", defaultServerName); if (isEmpty(defaultServerName)) { defaultServerName = System.getProperty("datasource.default"); if (isEmpty(defaultServerName)) { @@ -74,6 +75,7 @@ class PrimaryServer { if (defaultServerName == null) { defaultServerName = "db"; } + System.setProperty("ebean_db", defaultServerName); return defaultServerName; }