Browse Source

json end points

Luciano Andrade 7 years ago
parent
commit
f37b1c4ec3
2 changed files with 46 additions and 4 deletions
  1. 22 1
      readme.md
  2. 24 3
      tools/src/Release.php

+ 22 - 1
readme.md

@@ -65,4 +65,25 @@ 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
-~~~
+~~~
+
+
+
+[nginx] -> [base*]
+[nginx] -> [ftth*]
+[nginx] -> [stats*]
+[nginx] -> [mapas*]
+[nginx] -> [grafana]
+[nginx] -> [pma]
+[nginx] -> [mongoexpress]
+[nginx] -> [json_endpoint]
+
+[docker] --:> [nginx]
+[docker] --:> [stasd]
+[docker] --:> [supervisord]
+[docker] --:> [ftth_worker]
+[docker] --:> [installer]
+
+[docker] --:> [mysql]
+[docker] --:> [mongodb]
+

+ 24 - 3
tools/src/Release.php

@@ -247,7 +247,6 @@ $oauth_client_secret = "5w7gx6ptdoo4g8cwwo88o8gowosgco84sso08ssow0osg88g8k";
 
 	$composer->addService("amqp")->image("rabbitmq:3-management")
 		->restart("always")
-		->addPorts(8072, 15672)
 	;
 
 
@@ -307,15 +306,37 @@ $oauth_client_secret = "5w7gx6ptdoo4g8cwwo88o8gowosgco84sso08ssow0osg88g8k";
 	;
 
 	$composer->addService("jsendpoint")
-		->image($registry."fd3/jsendpoint:$v")
+		->build("./extra/statsd/endpoint/json")
+		->image($registry."fd3/jsonep:$v")
+		->addVolumes("./extra/statsd/endpoint/json", "/opt/datasource")
+		->addLinks("jsonep_mysql")
+		->addLinks("jsonep_mongo")
+		->restart("always")
+		;
+
+	$composer->addService("jsonep_mysql")
 		->build("./extra/statsd/endpoint/mysql")
+		->image($registry."fd3/jsonep_mysql:$v")
 		->addVolumes("./extra/statsd/endpoint/mysql", "/opt/datasource")
 		->addLinks("mysql")
-		->addPorts(9000, 8000)
 		->addEnviroment("MYSQL_ROOT_PASSWORD", $mysql_root_pass)
 		->restart("always")
 		;
 
+        $composer->addService("jsonep_mongo")
+		->build("./extra/statsd/endpoint/mongodb")
+		->image($registry."fd3/jsonep_mongo:$v")
+		->addVolumes("./extra/statsd/endpoint/mongodb", "/opt/datasource")
+		->addLinks("mongodb")
+		->restart("always")
+		;
+
+	$composer->addService("mongodb")
+		->image("mongo:3.4")
+		->addVolumes("./mongodb", "/data/db")
+	;
+
+
 	$composer->addService("statsd")->build("./extra/statsd/statsd")
 		->image($registry."fd3/statsd:$v")
 		->addPorts("8125", "8125/udp")