few more defaults for the mc-config.groovy for docker

MetadataConsulting · Dec 7, 2015 · 4ad3f4b · 4ad3f4b
1 parent 320bb81
commit 4ad3f4b
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/conf/docker/mc-config.groovy b/conf/docker/mc-config.groovy
@@ -1,12 +1,12 @@
 // config
 grails.logging.jul.usebridge = false
-grails.serverURL =  "http://${System.getenv('VIRTUAL_HOST') ?: System.getenv('METADATA_URL')}"
+grails.serverURL =  "http://${System.getenv('VIRTUAL_HOST') ?: System.getenv('METADATA_URL') ?: System.getenv('DOCKER_MACHINE_IP') ?: new URL("http://checkip.amazonaws.com").text.trim()}"
 
 // datasource
 dataSource {
 
-    def metadataDbPassword = System.getenv('METADATA_PASSWORD')
-    def metadataDbUsername = System.getenv('METADATA_USERNAME')
+    def metadataDbPassword = System.getenv('METADATA_PASSWORD') ?: 'metadata'
+    def metadataDbUsername = System.getenv('METADATA_USERNAME') ?: 'metadata'
     def metadataJdbcString = System.getenv('METADATA_JDBC_URL')
 
     if (!metadataJdbcString && System.getenv("MC_MYSQL_NAME")) {