Added docker image for mariadb, configured environment variables for …

…local and qa environments.

.local.env

@@ -1,5 +1,14 @@
 API_HOST=http://local.api.spira.io:8080
 APP_HOST=http://local.app.spira.io
+
 XDEBUG_ENABLED=true
+
+# spira main postgres database
 POSTGRES_PASSWORD=spira
-POSTGRES_USER=spira
+POSTGRES_USER=spira
+
+# vanilla forums database
+MYSQL_ROOT_PASSWORD=root
+MYSQL_USER=spira_vanilla
+MYSQL_PASSWORD=spira_vanilla
+MYSQL_DATABASE=spira_vanilla

.qa.env

@@ -2,5 +2,13 @@
 API_HOST=http://qa.api.spira.io:8080
 APP_HOST=http://qa.app.spira.io
 XDEBUG_ENABLED=false
-POSTGRES_PASSWORD=spiraqa
-POSTGRES_USER=spiraqa
+
+# spira main postgres database
+POSTGRES_PASSWORD=spira_qa
+POSTGRES_USER=spira_qa
+
+# vanilla forums database
+MYSQL_ROOT_PASSWORD=root_qa
+MYSQL_USER=spira_vanilla_qa
+MYSQL_PASSWORD=spira_vanilla_qa
+MYSQL_DATABASE=spira_vanilla_qa

docker-compose.qa.yml

@@ -17,6 +17,14 @@ database:
   ports:
     - "5432:5432"
 
+vanilla_database:
+  image: mariadb:10.0
+  env_file:
+    - .common.env
+    - .local.env
+  ports:
+    - "3306:3306"
+
 cache:
   image: redis
 

docker-compose.yml

@@ -18,6 +18,14 @@ database:
   ports:
     - "5432:5432"
 
+vanilladatabase:
+  image: mariadb:10.0
+  env_file:
+    - .common.env
+    - .local.env
+  ports:
+    - "3306:3306"
+
 cache:
   image: redis
 
@@ -48,13 +56,14 @@ php:
     - data
   links:
     - database:database
+    - vanilladatabase:vanilladatabase
     - cache:cache
     - queue:queue
     - mailcatcher:mailcatcher
   env_file:
-      - .common.env
-      - .local.env
-      - .secret.env
+    - .common.env
+    - .local.env
+    - .secret.env
   privileged: true
 
 web:
@@ -76,8 +85,8 @@ web:
 
 devtools:
   image: spira/docker-dev-tools:latest
-  working_dir: /data
 #  image: spira/docker-dev-tools:phantomjs-1.9.8
+  working_dir: /data
   volumes_from:
     - data
   privileged: true
@@ -89,6 +98,7 @@ devtools:
     - web:web
     - mailcatcher:mailcatcher
     - database:database
+    - vanilladatabase:vanilladatabase
     - cache:cache
     - queue:queue