Merge 2c0e061 into 5486030

grobid-service/config/config.yaml

@@ -1,12 +1,12 @@
 grobid:
   # NOTE: change these values to absolute paths when running on production
-  grobidHome: "grobid-home"
+  grobidHome: ${GROBID__GROBID_HOME:- "grobid-home"}
 
   # how to load the models, 
   # false -> models are loaded when needed (default), avoiding putting in memory useless models
   # true -> all the models are loaded into memory at the server startup, slow the start of the services and models not
   # used will take some memory
-  modelPreload: false
+  modelPreload: ${GROBID__MODEL_PRELOAD:- false}
 
   # CORS configuration
   corsAllowedOrigins: "*"

grobid-service/src/main/java/org/grobid/service/main/GrobidServiceApplication.java

@@ -6,6 +6,8 @@
 import com.hubspot.dropwizard.guicier.GuiceBundle;
 import io.dropwizard.Application;
 import io.dropwizard.assets.AssetsBundle;
+import io.dropwizard.configuration.EnvironmentVariableSubstitutor;
+import io.dropwizard.configuration.SubstitutingSourceProvider;
 import io.dropwizard.forms.MultiPartBundle;
 import io.dropwizard.setup.Bootstrap;
 import io.dropwizard.setup.Environment;
@@ -40,6 +42,9 @@ public String getName() {
 
     @Override
     public void initialize(Bootstrap<GrobidServiceConfiguration> bootstrap) {
+        bootstrap.setConfigurationSourceProvider(new SubstitutingSourceProvider(
+            bootstrap.getConfigurationSourceProvider(), new EnvironmentVariableSubstitutor(false)));
+
         GuiceBundle<GrobidServiceConfiguration> guiceBundle = GuiceBundle.defaultBuilder(GrobidServiceConfiguration.class)
             .modules(getGuiceModules())
             .build();