|
@@ -205,7 +205,16 @@ class Release extends Command
|
|
|
"PMA_ABSOLUTE_URI"=> ""
|
|
|
),
|
|
|
'OAUTH' => false,
|
|
|
- 'MODULE_INSTALL' => false
|
|
|
+ 'MODULE_INSTALL' => true
|
|
|
+ ),
|
|
|
+ "swagger" => array(
|
|
|
+ 'HOST_ENV' => true,
|
|
|
+ "VAR_ENV" => array(
|
|
|
+ "SWAGGER_JSON" => "/opt/swagger/api.v1.json",
|
|
|
+ "PORT" => "80"
|
|
|
+ ),
|
|
|
+ 'OAUTH' => false,
|
|
|
+ 'MODULE_INSTALL' => true
|
|
|
),
|
|
|
"extra" => array(
|
|
|
'HOST_ENV' => false,
|
|
@@ -660,10 +669,6 @@ class Release extends Command
|
|
|
->image($registry . "fd3/$module:" . $version)
|
|
|
->restart($this->_docker_restart_default)
|
|
|
->build("./extra/" . $module)
|
|
|
- ->addLinks('nginx:base.fd3.flowdat.com')
|
|
|
- ->addLinks('nginx:cablemodem.fd3.flowdat.com')
|
|
|
- ->addLinks('nginx:ftth.fd3.flowdat.com')
|
|
|
- ->addLinks('nginx:radius.fd3.flowdat.com')
|
|
|
->addEnv_file("running.env")
|
|
|
->addEnv_file($host_env_file)
|
|
|
->addEnv_file($module . "." . $host_env_file)
|
|
@@ -699,6 +704,7 @@ class Release extends Command
|
|
|
->addVolumes('./extra/api/', '/opt/api')
|
|
|
->addVolumes("/var/run/docker.sock", "/tmp/docker.sock:ro")
|
|
|
->addVolumes("pma_volumen", "/opt/pma")
|
|
|
+ ->addVolumes("swagger_volumen", "/opt/swagger")
|
|
|
->addVolumes("./extra/nginx/certs", "/etc/nginx/certs:ro")
|
|
|
->addVolumes("./extra/nginx/conf.d", "/etc/nginx/conf.d")
|
|
|
->addVolumes("./extra/nginx/share", "/usr/share/nginx/html");
|
|
@@ -738,6 +744,7 @@ class Release extends Command
|
|
|
->addVolumes("./extra/supervisord/", "/etc/supervisord/")
|
|
|
->addVolumes("./extra/supervisord/var/", "/var/log/supervisor/")
|
|
|
->addVolumes("./extra/supervisord/sshd_config", "/etc/ssh/sshd_config")
|
|
|
+ ->addVolumes("./extra/supervisord/bin/connect", "/usr/bin/connect")
|
|
|
->addVolumes("./extra/supervisord/bin/fiberhome", "/usr/bin/fiberhome")
|
|
|
->addVolumes("./extra/supervisord/bin/fiberlink", "/usr/bin/fiberlink")
|
|
|
->addVolumes("./extra/supervisord/bin/huawei", "/usr/bin/huawei")
|
|
@@ -973,7 +980,6 @@ class Release extends Command
|
|
|
->addLinks("mysql")
|
|
|
->addLinks("base")
|
|
|
->addLinks("nginx", $this->getDomain("base"))
|
|
|
- ->addLinks("nginx", $this->getDomain("dhcp"))
|
|
|
->addEnv_file("running.env")
|
|
|
->addEnv_file("host.env")
|
|
|
->addEnv_file("cablemodem.host.env")
|
|
@@ -989,7 +995,6 @@ class Release extends Command
|
|
|
->addLinks("mysql")
|
|
|
->addLinks("base")
|
|
|
->addLinks("nginx", $this->getDomain("base"))
|
|
|
- ->addLinks("nginx", $this->getDomain("cablemodem"))
|
|
|
->addEnv_file("running.env")
|
|
|
->addEnv_file("host.env")
|
|
|
->addEnv_file("dhcp.host.env")
|
|
@@ -1109,19 +1114,23 @@ class Release extends Command
|
|
|
*/
|
|
|
public function addSwagger(FileFormat2 $composer, $config = array())
|
|
|
{
|
|
|
+ $module = "swagger";
|
|
|
$version = "latest";
|
|
|
$registry = "";
|
|
|
+ $host_env_file = "";
|
|
|
extract($config);
|
|
|
-
|
|
|
+
|
|
|
$composer
|
|
|
- ->addService("swagger-ui")
|
|
|
+ ->addService($module)
|
|
|
->image($registry . "fd3/swagger-ui:" . $version)
|
|
|
->build("./extra/swagger/")
|
|
|
->restart($this->_docker_restart_default)
|
|
|
- ->addEnviroment("SWAGGER_JSON", "/opt/api/api.v1.json")
|
|
|
+ ->addEnv_file($module . "." . $host_env_file)
|
|
|
->addEnv_file("running.env")
|
|
|
->addEnv_file("host.env")
|
|
|
- ->addPorts(8090, 8080);
|
|
|
+ ->addVolumes("swagger_volumen", "/usr/share/nginx/html");
|
|
|
+
|
|
|
+ $this->writeVariablesEnviroment($module . "." . $host_env_file, $module);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -1129,6 +1138,7 @@ class Release extends Command
|
|
|
{
|
|
|
$composer = new FileFormat2("../");
|
|
|
$composer->getVolumes()->addVolumen('pma_volumen', 'local');
|
|
|
+ $composer->getVolumes()->addVolumen('swagger_volumen', 'local');
|
|
|
$base_vars = array(
|
|
|
"version" => $version,
|
|
|
"host_env_file" => $host_env_file,
|
|
@@ -1256,7 +1266,7 @@ class Release extends Command
|
|
|
$env .= "VIRTUAL_HOST=" . $this->getDomain($module) . "\n";
|
|
|
} else if($key == 'PMA_ABSOLUTE_URI') {
|
|
|
$env .= "PMA_ABSOLUTE_URI=" . $this->getDomain("pma") . "\n";
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
$env .= $key . "=" . $value . "\n";
|
|
|
}
|
|
|
}
|