Merge remote-tracking branch 'origin/FD3-287'

tools/src/Release.php

@@ -423,11 +423,34 @@ inventory=inventory.ini
 	$fd_domain = "fd3.flowdat.com";
 	extract($config);
 
-	$composer->addService("genieacs")
-		->image("thebinary/genieacs:latest")
+	$composer->addService("genieacs-cwmp")
+        ->build("extra/genieacs/genieacs-cwmp")
         ->addLinks("mongodb")
         ->addLinks("redis")
-        ->addPorts("7777", "7777")
+        ->addPorts("7547", "7547")
+        ->restart("always")
+	;
+
+	$composer->addService("genieacs-nbi")
+        ->build("extra/genieacs/genieacs-nbi")
+        ->addLinks("mongodb")
+        ->addLinks("redis")
+        ->addPorts("7557", "7557")
+        ->restart("always")
+	;
+
+	$composer->addService("genieacs-fs")
+        ->build("extra/genieacs/genieacs-fs")
+        ->addLinks("mongodb")
+        ->addLinks("redis")
+        ->addPorts("7567", "7567")
+        ->restart("always")
+	;
+
+	$composer->addService("genieacs-gui")
+        ->build("extra/genieacs/genieacs-gui")
+        ->addLinks("genieacs-nbi")
+        ->addPorts("3001", "3000")
         ->restart("always")
 	;
     }
@@ -612,6 +635,8 @@ $oauth_client_secret = "5w7gx6ptdoo4g8cwwo88o8gowosgco84sso08ssow0osg88g8k";
 	$this->addMongDb($composer, $base_vars);
 	$this->addRedis($composer);
 
+	$this->addGenieACS($composer, $base_vars);
+
 	$this->addFreeradius($composer, $base_vars + array(
 		'mysql_root_pass' => $mysql_root_pass,
 		'mysql_user' => $mysql_user,