FD3-333 docker-compose.yml updated

docker-compose.yml

@@ -14,7 +14,7 @@ services:
     environment:
       VIRTUAL_HOST: base.fd3.flowdat.com
       HTTPS_METHOD: nohttps
-    volumes: 
+    volumes:
       - ./base/:/opt/base/
 
   ftth:
@@ -38,7 +38,7 @@ services:
       #LETSENCRYPT_HOST: ftth.fd3.flowdat.com
       #LETSENCRYPT_EMAIL: andrade.luciano@gmail.com
       AMQP_KEY: ftth
-    volumes: 
+    volumes:
       - ./ftth/:/opt/ftth/
   radius:
     restart: always
@@ -65,7 +65,7 @@ services:
       #LETSENCRYPT_EMAIL: andrade.luciano@gmail.com
     volumes:
       - ./radius/:/opt/radius/
-      
+
   mapas:
     restart: always
     image: fd3-mapas
@@ -84,7 +84,7 @@ services:
       OAUTH_CLIENT_ID : 1_3323sq6urn8kwccg8s4ok848ggwwgkw4c08wsc4cwkc08osocc
       OAUTH_CLIENT_SECRET : 5w7gx6ptdoo4g8cwwo88o8gowosgco84sso08ssow0osg88g8k
 
-    volumes: 
+    volumes:
       - ./mapas/:/opt/mapas/
 
   stats:
@@ -107,10 +107,10 @@ services:
       OAUTH_CLIENT_ID : 1_3323sq6urn8kwccg8s4ok848ggwwgkw4c08wsc4cwkc08osocc
       OAUTH_CLIENT_SECRET : 5w7gx6ptdoo4g8cwwo88o8gowosgco84sso08ssow0osg88g8k
       AMQP_KEY: stats
-    volumes: 
+    volumes:
       - ./stats/:/opt/stats/
       - ./geoserver/geoserver-shapes:/var/www/shapes
-      
+
   cablemodem:
     restart: always
     image: fd3-cablemodem
@@ -133,15 +133,15 @@ services:
       OAUTH_CLIENT_SECRET: 60n93pmoh10c848wg0sc0844ow84sco0sc8gkockow4sg4sc0g
       HTTPS_METHOD: nohttps
     volumes:
-      - ./cablemodem/:/opt/cablemodem/    
- 
+      - ./cablemodem/:/opt/cablemodem/
+
   mysql:
     restart: always
     environment:
         MYSQL_ROOT_PASSWORD: 235r2342gtfsw
         MYSQL_USER: iksop
         MYSQL_PASSWORD: 235r2342gtfsw
-    volumes: 
+    volumes:
       - ./mysql/:/var/lib/mysql/
     image: mysql:5.7
 
@@ -151,7 +151,7 @@ services:
     restart: always
     ports:
       - "8072:15672"
-  
+
   ftth_worker:
     restart: always
     image: fd3-ftth
@@ -171,14 +171,14 @@ services:
       OAUTH_CLIENT_SECRET: 60n93pmoh10c848wg0sc0844ow84sco0sc8gkockow4sg4sc0g
       AMQP_KEY: ftth
 
-    volumes: 
+    volumes:
       - ./ftth/:/opt/ftth/
-      
+
   command_consumer_worker:
     restart: always
     image: fd3-ftth
     build:
-      context: ./ftth    
+      context: ./ftth
     command: bin/console rabbitmq:consumer command_consumer
     restart: always
     links:
@@ -190,12 +190,12 @@ services:
       HOST_FTTH: ftth.fd3.flowdat.com
       HOST_BASE: base.fd3.flowdat.com
       OAUTH_CLIENT_ID: 1_4gs3n2b9s7mso00kgogoks4k0ogk0ggs0w0k4k484gkowcg08k
-      OAUTH_CLIENT_SECRET: 60n93pmoh10c848wg0sc0844ow84sco0sc8gkockow4sg4sc0g  
+      OAUTH_CLIENT_SECRET: 60n93pmoh10c848wg0sc0844ow84sco0sc8gkockow4sg4sc0g
       AMQP_KEY: ftth
 
-    volumes: 
+    volumes:
       - ./ftth/:/opt/ftth/
-      
+
   stats_command_worker:
     restart: always
     image: docker.infra.flowdat.com/fd3/stats:latest
@@ -215,7 +215,7 @@ services:
       AMQP_KEY: stats
     volumes:
       - ./stats:/opt/stats
-      
+
   log_consumer_worker:
     restart: always
     image: docker.infra.flowdat.com/fd3/base:latest
@@ -226,12 +226,12 @@ services:
       - amqp:amqp
       - nginx-proxy:base.fd3.flowdat.com
     env_file:
-      - host.env      
+      - host.env
     environment:
       OAUTH_CLIENT_ID: 1_4gs3n2b9s7mso00kgogoks4k0ogk0ggs0w0k4k484gkowcg08k
-      OAUTH_CLIENT_SECRET: 60n93pmoh10c848wg0sc0844ow84sco0sc8gkockow4sg4sc0g  
+      OAUTH_CLIENT_SECRET: 60n93pmoh10c848wg0sc0844ow84sco0sc8gkockow4sg4sc0g
       AMQP_KEY: base
- 
+
   phpmyadmin:
     restart: always
     image: phpmyadmin/phpmyadmin
@@ -273,7 +273,7 @@ services:
     image: fd3_simple_json_endpoint
     ports:
       - 9003:8000
-    build: 
+    build:
       context: ./statsd/endpoint/json
     links:
         - mysql_jsonendpoint:mysql_jsonendpoint
@@ -282,7 +282,7 @@ services:
       - ./statsd/endpoint/json:/opt/datasource
     environment:
       TIMEOUT: 60000
-      
+
   mysql_jsonendpoint:
     restart: always
     image: fd3_simple_json_endpoint_mysql
@@ -292,7 +292,7 @@ services:
       - mysql:mysql
     ports:
       - 9000:8000
-    build: 
+    build:
       context: ./statsd/endpoint/mysql
     volumes:
       - ./statsd/endpoint/mysql:/opt/datasource
@@ -305,7 +305,7 @@ services:
       - mongodb:mongodb
     ports:
       - 9002:8000
-    build: 
+    build:
       context: ./statsd/endpoint/mongodb
     volumes:
       - ./statsd/endpoint/mongodb:/opt/datasource
@@ -319,14 +319,14 @@ services:
       - mongodb:mongo
 
   mongodb:
-    volumes: 
-      - ./mongodb:/data/db 
+    volumes:
+      - ./mongodb:/data/db
     image: mongo:3.4
 
   statsd:
     restart: always
     image: fd3-statsd-mysql-backend
-    build: 
+    build:
       context: extra/statsd/statsd
     ports:
       - "8125:8125/udp"
@@ -336,7 +336,7 @@ services:
     volumes:
       - ./statsd/statsd/:/opt/config
       - ./statsd/backend/mongodb/mongodb.js:/opt/statsd/backends/mongodb.js
- 
+
   supervisord:
     restart: always
     image: fd3-supervisord
@@ -345,7 +345,10 @@ services:
     ports:
       - "9001:9001"
     privileged: true
-    volumes: 
+    links:
+      - mongodb:mongodb
+      - mysql:mysql
+    volumes:
       - ./supervisord/:/etc/supervisord/
       - ./supervisord/var/:/var/log/supervisor/
       - ./supervisord/sshd_config:/etc/ssh/sshd_config
@@ -353,7 +356,7 @@ services:
       - ./supervisord/bin/fiberlink:/usr/bin/fiberlink
     environment:
       TERM: "xterm"
-  
+
   geoserver:
     build:
       context: extra/geoserver/
@@ -366,7 +369,7 @@ services:
     ports:
       - 8082:8080
     restart: unless-stopped
- 
+
   nginx-proxy:
         build:
             context: extra/nginx/
@@ -382,7 +385,7 @@ services:
             - './extra/nginx/certs:/etc/nginx/certs:ro'
             - './extra/nginx/vhost.d:/etc/nginx/vhost.d'
             - './extra/nginx/share:/usr/share/nginx/html'
-  
+
   redis:
     image: redis:latest
     restart: always
@@ -396,4 +399,4 @@ services:
 #      - /var/run/docker.sock:/var/run/docker.sock:ro
 #      - ./nginx/certs:/etc/nginx/certs
 #      - ./nginx/vhost.d:/etc/nginx/vhost.d
-# 
+#