|
@@ -23,7 +23,7 @@ class Stats_cmd extends InitialService
|
|
->setHostEnv(false)
|
|
->setHostEnv(false)
|
|
->setVarEnv([])
|
|
->setVarEnv([])
|
|
->setOauth(false)
|
|
->setOauth(false)
|
|
- ->setRequired(false)
|
|
|
|
|
|
+ ->setRequired(true)
|
|
->setDepends(['stats']);
|
|
->setDepends(['stats']);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -33,29 +33,26 @@ class Stats_cmd extends InitialService
|
|
*/
|
|
*/
|
|
public function add()
|
|
public function add()
|
|
{
|
|
{
|
|
- $module = $this->getModuleName();
|
|
|
|
- $initial = $this->getInitialName();
|
|
|
|
|
|
+ $module = "stats_command";
|
|
$version = "latest";
|
|
$version = "latest";
|
|
$registry = "";
|
|
$registry = "";
|
|
|
|
+ $host_env_file = "";
|
|
extract($this->getConfigVar());
|
|
extract($this->getConfigVar());
|
|
if ($this->getRelease()->needInstallModule($module)) {
|
|
if ($this->getRelease()->needInstallModule($module)) {
|
|
$this->getComposer()->addService($module)
|
|
$this->getComposer()->addService($module)
|
|
- ->image($registry . "fd3/$initial:" . $version);
|
|
|
|
|
|
+ ->image($registry . "fd3/$module:" . $version);
|
|
if ($this->getProduction() === false) {
|
|
if ($this->getProduction() === false) {
|
|
$this->getComposer()->service($module)
|
|
$this->getComposer()->service($module)
|
|
- ->build("./$initial/")
|
|
|
|
- ->addVolumes("./$initial/", "/opt/$initial/");
|
|
|
|
|
|
+ ->build("./$module/")
|
|
|
|
+ ->addVolumes("./$module/", "/opt/$module/");
|
|
}
|
|
}
|
|
$this->getComposer()->service($module)
|
|
$this->getComposer()->service($module)
|
|
->hostname($module)
|
|
->hostname($module)
|
|
- ->command("bin/console rabbitmq:consumer command_consumer")
|
|
|
|
->restart($this->getRelease()->_docker_restart_task)
|
|
->restart($this->getRelease()->_docker_restart_task)
|
|
- ->addEnv_file($this->getRelease()->_running_env)
|
|
|
|
->addEnv_file($this->getRelease()->_host_env)
|
|
->addEnv_file($this->getRelease()->_host_env)
|
|
- ->addEnv_file("$initial." . $this->getRelease()->_host_env)
|
|
|
|
- ->addEnviroment("AMQP_KEY", $initial)
|
|
|
|
|
|
+ ->addEnviroment("DEV_MODE", $this->getProduction() === false ? 1 : 0)
|
|
|
|
+ ->addEnv_file("mysql." . $host_env_file)
|
|
->addVolumes("/etc/localtime:/etc/localtime:ro")
|
|
->addVolumes("/etc/localtime:/etc/localtime:ro")
|
|
- ->addVolumes("./hosts:/etc/hosts")
|
|
|
|
->network($this->getRelease()->_network_name)->ipv4_address($this->generateIP());
|
|
->network($this->getRelease()->_network_name)->ipv4_address($this->generateIP());
|
|
if ($this->getRelease()->isModuleAvailable(new Geoserver())) {
|
|
if ($this->getRelease()->isModuleAvailable(new Geoserver())) {
|
|
$this->getComposer()->service($module)
|
|
$this->getComposer()->service($module)
|
|
@@ -63,10 +60,8 @@ class Stats_cmd extends InitialService
|
|
}
|
|
}
|
|
|
|
|
|
$this->addLink(new Mysql(), $module)
|
|
$this->addLink(new Mysql(), $module)
|
|
- ->addLink(new Base(), $module)
|
|
|
|
- ->addLink(new Geoserver(), $module)
|
|
|
|
- ->addLinkNginx(new Base(), $module)
|
|
|
|
- ->addLinkNginx(new Geoserver(), $module);
|
|
|
|
|
|
+ ->addLink(new Redis(), $module)
|
|
|
|
+ ->addLink(new Amqp(), $module);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|