merge origin/msater

bin/database.sh

@@ -7,5 +7,8 @@ docker-compose run ftth bin/console doctrine:schema:update --force
 docker-compose exec mapas bin/console doctrine:database:create -q
 docker-compose exec mapas bin/console doctrine:schema:update --force
 
+docker-compose exec stats bin/console doctrine:database:create -q
+docker-compose exec stats bin/console doctrine:schema:update --force
+
 docker-compose exec mysql mysqladmin -u root -p$MYSQL_ROOT_PASSWORD create statsd_db
 docker-compose exec mysql mysqladmin -u root -p$MYSQL_ROOT_PASSWORD create grafana

bin/init-apps.sh

@@ -1,7 +1,9 @@
 docker-compose build base
 docker-compose build ftth
 docker-compose build mapas
+docker-compose build stats
 
 docker-compose up -d base
 docker-compose up -d ftth
 docker-compose up -d mapas
+docker-compose up -d stats

docker-compose.yml

@@ -30,7 +30,7 @@ services:
     links:
       - mysql:mysql
       - base:base
-      - base:base.fd3.flowdat.com
+      - nginx-proxy:base.fd3.flowdat.com
       - amqp:amqp
     environment:
       VIRTUAL_HOST: ftth.fd3.flowdat.com

readme.md

@@ -1,16 +1,20 @@
-#Clonar los repositorios: ftth - base - mapas
+#Clonar los repositorios:
 
 ~~~
 git clone -b demo git@bitbucket.org:ikflowdat/base.git ;
 git clone -b demo git@bitbucket.org:ikflowdat/ftth.git ;
 git clone -b demo git@bitbucket.org:ikflowdat/mapas.git ;
+git clone -b demo git@bitbucket.org:ikflowdat/stats.git ;
 ~~~
 
+Cambiar demo por otro branch si se requiere
+
 #Instalar vendors 
 ~~~
 docker-compose run base 
 docker-compose run ftth 
 docker-compose run mapas 
+docker-compose run stats
 ~~~
 
 Opción(*):
@@ -22,13 +26,13 @@ bin/init-apps.sh
 
 #Crear la base de datos y las tablas
 ~~~
-docker-compose run base bin/console doctrine:database:create -q
-docker-compose run base bin/console doctrine:schema:update --force
+docker-compose exec base bin/console doctrine:database:create -q
+docker-compose exec base bin/console doctrine:schema:update --force
 ~~~
 
 ~~~
-docker-compose run ftth bin/console doctrine:database:create -q
-docker-compose run ftth bin/console doctrine:schema:update --force
+docker-compose exec ftth bin/console doctrine:database:create -q
+docker-compose exec ftth bin/console doctrine:schema:update --force
 ~~~
 
 ~~~
@@ -36,6 +40,11 @@ docker-compose exec mapas bin/console doctrine:database:create -q
 docker-compose exec mapas bin/console doctrine:schema:update --force
 ~~~
 
+~~~
+docker-compose exec stats bin/console doctrine:database:create -q
+docker-compose exec stats bin/console doctrine:schema:update --force
+~~~
+
 Opción(*):
 
 ~~~
@@ -56,4 +65,4 @@ docker-compose exec base bin/console fos:user:promote --super admin
 ~~~
 docker-compose exec mysql mysqldump -A -uroot -p 235r2342gtfsw > dump.sql
 docker-compose exec mysql mysql -uroot -p 235r2342gtfsw < dump.sql
-~~~
+~~~