...

.drone.yml

@@ -41,12 +41,16 @@ pipeline:
       - docker-compose -v
       - echo "Hasta aqui es instalación de paquetes requeridos docker y docker-compose"
       - cd tools 
+      - chmod 0600 keys/bitbucket.id_rsa*
       - eval $(ssh-agent) ; ssh-add keys/bitbucket.id_rsa
       - composer install -n
       - rm -rf demo
       - php cmd.php make:install demo
       - cd demo 
       - php ../cmd.php get:source git.ini
+      - cat docker-compose.yml
+      - docker-compose config
+      - docker-compose build
       - docker-compose up -d
   
  

tools/src/Release.php

@@ -147,8 +147,43 @@ inventory=inventory.ini
 
     }
 
+    function addBase($composer, $config = array(), $flavor = "dev"){ 
+	$version = "latest";
+	$domain = "fd3.flowdat.com";
+	extract($config);
+	$composer->addService("base")
+		->image($registry."fd3/base:" . $version)
+		->build("./base/")
+		->restart("always")
+		->addLinks("mysql")
+		->addLinks("amqp")
+		->addEnviroment("VIRTUAL_HOST", "base.".$domain)
+		->addEnviroment("HOST_FTTH", 	"ftth.".$domain)
+		->addEnviroment("HOST_STATS", 	"stats.".$domain)
+		->addEnviroment("HOST_MAPAS", 	"mapas.".$domain)
+		->addEnviroment("HOST_BASE", 	"base." .$domain)
+		->addVolumes("./base/", "/opt/base")
+	;
+
+    }
+
+    function addMySql($composer, $config, $flavor = "dev"){
+	$version = "latest";
+	$domain = "fd3.flowdat.com";
+	extract($config);
+
+	$composer->addService("mysql")->image($registry."fd3/mysql:". $version)
+		->build("./extra/mysql")
+		->addVolumes("./mysql/", "/var/lib/mysql/")
+
+		->addEnviroment("MYSQL_ROOT_PASSWORD", $mysql_root_pass)
+		->addEnviroment("MYSQL_USER", $mysql_user)
+		->addEnviroment("MYSQL_PASSWORD", $mysq_pass)
+	;
+    }
+
     function getDockerComposer( $v = "latest", $host_env_file = "host.env", $registry = "docker.infra.flowdat.com/", $fd_domain = "fd3.flowdat.com")
-{
+    {
 
 $mysql_root_pass="235r2342gtfsw";
 $mysql_user="iksop";
@@ -159,19 +194,7 @@ $oauth_client_secret = "5w7gx6ptdoo4g8cwwo88o8gowosgco84sso08ssow0osg88g8k";
 
 	$composer = new FileFormat2("../");
 
-	$composer->addService("base")
-		->image($registry."fd3/base:" . $v)
-		->build("./base/")
-		->restart("always")
-		->addLinks("mysql")
-		->addLinks("amqp")
-		->addEnviroment("VIRTUAL_HOST", "base.".$fd_domain)
-		->addEnviroment("HOST_FTTH", 	"ftth.".$fd_domain)
-		->addEnviroment("HOST_STATS", 	"stats.".$fd_domain)
-		->addEnviroment("HOST_MAPAS", 	"mapas.".$fd_domain)
-		->addEnviroment("HOST_BASE", 	"base." .$fd_domain)
-		->addVolumes("./base/", "/opt/base")
-	;
+	$this->addBase($composer, array("version" => $v, "domain" => $fd_domain)); 
 
 	//$composer->addService("ftth")
 	//	->image($registry."fd3/ftth:" . $v)
@@ -244,14 +267,11 @@ $oauth_client_secret = "5w7gx6ptdoo4g8cwwo88o8gowosgco84sso08ssow0osg88g8k";
 	/**************************************************************************************/
 	/* Servicios */
 	/**************************************************************************************/
-	$composer->addService("mysql")->image($registry."fd3/mysql:". $v)
-		->build("./extra/mysql")
-		->addVolumes("./mysql/", "/var/lib/mysql/")
-
-		->addEnviroment("MYSQL_ROOT_PASSWORD", $mysql_root_pass)
-		->addEnviroment("MYSQL_USER", $mysql_user)
-		->addEnviroment("MYSQL_PASSWORD", $mysq_pass)
-	;
+	$this->addMySql($composer, array(
+		'mysql_root_pass' => $mysql_root_pass,
+		'mysql_user' => $mysql_user,
+                'mysql_pass' => $mysql_pass,
+		));
 
 	$composer->addService("amqp")->image("rabbitmq:3-management")
 		->restart("always")