|
@@ -670,7 +670,7 @@ class Release extends Command
|
|
|
$module = "pma";
|
|
|
$host_env_file = "";
|
|
|
extract($config);
|
|
|
-
|
|
|
+
|
|
|
$composer->addService("phpmyadmin")->image("phpmyadmin/phpmyadmin")
|
|
|
->restart($this->_docker_restart_default)
|
|
|
->addPorts(8080, 80)
|
|
@@ -692,20 +692,8 @@ class Release extends Command
|
|
|
->image("grafana/grafana")
|
|
|
->addLinks("mysql")
|
|
|
->restart($this->_docker_restart_default)
|
|
|
- ->addEnv_file("mysql." . $host_env_file)
|
|
|
- ->addVolumes("./statsd/grafana/lib", "/var/lib/grafana");
|
|
|
-
|
|
|
- $this->writeVariablesEnviroment($module . "." . $host_env_file, $module,
|
|
|
- array(
|
|
|
- "GF_SECURITY_ADMIN_PASSWORD", "queRini6",
|
|
|
- "GF_INSTALL_PLUGINS", "grafana-simple-json-datasource",
|
|
|
- "GF_DEFAULT_THEME", "light",
|
|
|
- "GF_AUTH_ANONYMOUS_ORG_NAME", "Main Org.",
|
|
|
- "GF_AUTH_ANONYMOUS_ORG_ROLE", "Viewer",
|
|
|
- "GF_AUTH_ANONYMOUS_ENABLED", "true",
|
|
|
- "GF_DATABASE_URL", "mysql://root:" . $this->_mysql_root_pass . "@mysql:3306/grafana",
|
|
|
- "GF_SERVER_ROOT_URL", "http://" . $this->getDomain("grafana") . "/"
|
|
|
- ));
|
|
|
+ ->addEnv_file("grafana.env")
|
|
|
+ ->addVolumes("./extra/statsd/grafana/lib", "/var/lib/grafana");
|
|
|
|
|
|
$this->addJsonEndPoints($composer, $config);
|
|
|
}
|