|
13 | 13 | import java.nio.file.Files; |
14 | 14 | import java.nio.file.Path; |
15 | 15 | import java.nio.file.Paths; |
16 | | -import java.util.ArrayList; |
17 | | -import java.util.Arrays; |
18 | | -import java.util.Iterator; |
19 | | -import java.util.LinkedHashMap; |
20 | | -import java.util.LinkedList; |
21 | | -import java.util.List; |
22 | | -import java.util.Locale; |
23 | | -import java.util.Map; |
24 | | -import java.util.Objects; |
25 | | -import java.util.Optional; |
26 | | -import java.util.Properties; |
| 16 | +import java.util.*; |
27 | 17 | import java.util.concurrent.Executor; |
28 | 18 | import java.util.concurrent.ExecutorService; |
29 | 19 | import java.util.concurrent.atomic.AtomicBoolean; |
@@ -1202,8 +1192,10 @@ public static void runApp( |
1202 | 1192 | @NonNull String[] args, |
1203 | 1193 | @NonNull ExecutionMode executionMode, |
1204 | 1194 | @NonNull List<Supplier<Jooby>> provider) { |
1205 | | - var cmd = parseArguments(args); |
1206 | | - var options = ServerOptions.from(ConfigFactory.parseMap(cmd)).orElse(null); |
| 1195 | + Map<String, Object> configMap = new HashMap<>(parseArguments(args)); |
| 1196 | + // Override with environment |
| 1197 | + configMap.putAll(System.getenv()); |
| 1198 | + var options = ServerOptions.from(ConfigFactory.parseMap(configMap)).orElse(null); |
1207 | 1199 | runApp(args, Server.loadServer(), options, executionMode, provider); |
1208 | 1200 | } |
1209 | 1201 |
|
|
0 commit comments