pass env file to server, safer handling of asset override dir

bin/run.sh

@@ -109,6 +109,9 @@ BUBBLE_JVM_OPTS="${BUBBLE_JVM_OPTS} -Djava.net.preferIPv4Stack=true"
 # Choose appropriate log config
 if [[ ${server} -eq 1 ]] ; then
   LOG_CONFIG="-Dlogback.configurationFile=logback.xml"
+  if [[ -f ${BUBBLE_ENV} ]] ; then
+    command="${BUBBLE_ENV}"
+  fi
 else
   LOG_CONFIG="-Dlogback.configurationFile=logback-client.xml"
 fi

bubble-server/src/main/resources/bubble-config.yml

@@ -34,6 +34,7 @@ database:
 staticAssets:
   baseUri: /
   assetRoot: site/
+  localOverride: {{BUBBLE_ASSETS_DIR}}
   utilPaths:
     INDEX_PATH: /index.html
     INDEX_ALIASES: /:/index.php

bubble-server/src/test/resources/test-bubble-config.yml

@@ -31,7 +31,7 @@ database:
 staticAssets:
   baseUri: /
   assetRoot: site/
-  localOverride: {{ASSETS_DIR}}
+  localOverride: {{BUBBLE_ASSETS_DIR}}
   singlePageApp: /index.html
   utilPaths:
     INDEX_PATH: /index.html

utils/cobbzilla-wizard

@@ -1 +1 @@
-Subproject commit 22bc9dc582dc9d1cf5269ff2fa36e178c97a47c3
+Subproject commit e20ad749d7887eac1c7e6618c9e855c9bcffdfec