Przeglądaj źródła

Se agregaron las lineas del Release.php a esta version

gabriel 6 lat temu
rodzic
commit
cbf11e89b0
1 zmienionych plików z 10 dodań i 4 usunięć
  1. 10 4
      tools/src/ReleaseV2.php

+ 10 - 4
tools/src/ReleaseV2.php

@@ -155,7 +155,7 @@ class ReleaseV2 extends Release
         $volumes = [
             'pma', 'base', 'cablemodem', 'cablemodem_upload', 'dhcp', 'ftth', 
             'mapas', 'mapas_upload', 'radius', 'stats', 'radius', 'stats', 'kea', 
-            'geoserver', 'grafana', 'mysql', 'mongodb',
+            'geoserver', 'grafana', 'mysql', 'mongodb', 'swagger'
         ];
         foreach ($volumes as $volume) {
             $composer->getVolumes()->addVolumen("{$volume}_volumen", 'local');
@@ -288,6 +288,7 @@ class ReleaseV2 extends Release
             ->addVolumes("dhcp_volumen", "/opt/dhcp")
             ->addVolumes("grafana_volumen", "/opt/grafana")
             ->addVolumes("pma_volumen", "/opt/pma")
+            ->addVolumes("swagger_volumen", "/opt/swagger")
             ->addVolumes("/var/run/docker.sock", "/tmp/docker.sock:ro")
             ->addVolumes('./extra/api/', '/opt/api')
             ->addVolumes("./extra/nginx/certs", "/etc/nginx/certs:ro")
@@ -410,6 +411,7 @@ class ReleaseV2 extends Release
             ->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")
@@ -717,18 +719,22 @@ class ReleaseV2 extends Release
      */
     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)
             ->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);
     }
 
 }