Merge branch 'master' into develop

weni-ai · Jul 19, 2018 · 2694d59 · 2694d59
2 parents bca3f1b + bffc072
commit 2694d59
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -23,23 +23,23 @@ services:
       - DEFAULT_DATABASE=${DEFAULT_DATABASE:-postgres://bothub:bothub@database:5432/bothub}
       - LANGUAGE_CODE=${LANGUAGE_CODE:-en-us}
       - TIME_ZONE=${TIME_ZONE:-UTC}
-      - EMAIL_HOST=${EMAIL_HOST:-}
+      - EMAIL_HOST=${EMAIL_HOST}
       - EMAIL_PORT=${EMAIL_PORT:-25}
       - DEFAULT_FROM_EMAIL=${DEFAULT_FROM_EMAIL:-webmaster@localhost}
       - SERVER_EMAIL=${SERVER_EMAIL:-root@localhost}
-      - EMAIL_HOST_USER=${EMAIL_HOST_USER:-}
-      - EMAIL_HOST_PASSWORD=${EMAIL_HOST_PASSWORD:-}
+      - EMAIL_HOST_USER=${EMAIL_HOST_USER}
+      - EMAIL_HOST_PASSWORD=${EMAIL_HOST_PASSWORD}
       - EMAIL_USE_SSL=${EMAIL_USE_SSL:-false}
       - EMAIL_USE_TLS=${EMAIL_USE_TLS:-false}
-      - ADMINS=${ADMINS:-}
-      - CSRF_COOKIE_DOMAIN=${CSRF_COOKIE_DOMAIN:-}
+      - ADMINS=${ADMINS}
+      - CSRF_COOKIE_DOMAIN=${CSRF_COOKIE_DOMAIN}
       - CSRF_COOKIE_SECURE=${CSRF_COOKIE_SECURE:-false}
       - BOTHUB_WEBAPP_BASE_URL=${BOTHUB_WEBAPP_BASE_URL:-http://localhost/}
       - BOTHUB_NLP_BASE_URL=${BOTHUB_NLP_BASE_URL:-http://localhost:2657/}
       - BUILD_WEBAPP=${BUILD_WEBAPP:-true}
       - WEBAPP_REPO=${WEBAPP_REPO:-https://github.com/Ilhasoft/bothub-webapp}
       - WEBAPP_BRANCH=${WEBAPP_BRANCH:-master}
       - API_BASE_URL=${API_BASE_URL:-/api}
-      - CHECK_ACCESSIBLE_API_URL=${CHECK_ACCESSIBLE_API_URL:-}
+      - CHECK_ACCESSIBLE_API_URL=${CHECK_ACCESSIBLE_API_URL}
       - SEND_EMAILS=${SEND_EMAILS:-true}
       - SUPPORTED_LANGUAGES=${SUPPORTED_LANGUAGES:-en|pt}