Merge branch 'dockerize-database' into 'master'

Dockerize database See merge request saburly/marketalarm/web!2
2019-04-30 12:07:09 +00:00
parent 864b917b4f 59723410b6
commit 9fdfce49ed
5 changed files with 175 additions and 78 deletions
--- a/app/config/config.json
+++ b/app/config/config.json
@@ -1,6 +1,10 @@
 {
  "development": {
-    "use_env_variable": "JAWSDB_URL"
+    "username": "docker",
+    "password": "docker",
+    "database": "marketalerts",
+    "port": "5432",
+    "dialect": "postgres"
  },
  "test": {
    "use_env_variable": "JAWSDB_URL"