gabriel 6 лет назад
Родитель
Сommit
ca80ae3bd1
4 измененных файлов с 5 добавлено и 14 удалено
  1. 1 0
      tools/src/Services/Cablemodem.php
  2. 1 0
      tools/src/Services/Dhcp.php
  3. 3 2
      tools/src/Services/Kea.php
  4. 0 12
      updateSupport.sh

+ 1 - 0
tools/src/Services/Cablemodem.php

@@ -60,6 +60,7 @@ class Cablemodem extends InitialService
 //                ->addVolumes("./$module/web/uploads", "/opt/$module/web/uploads")
                 ->addVolumes(self::CABLEMODEM_SOCKET_VOLUMEN, "/run/php/")
                 ->addVolumes(Nginx::CABLEMODEM_NGINX_VOLUMEN, "/opt/cablemodem/web")
+                ->addVolumes("./tftpboot", "/tftpboot")
                 ->network($this->getRelease()->_network_name)->ipv4_address($this->generateIP($this->ip_server));
             $this->addLink(new Mysql(), $module)
                 ->addLink(new Base(), $module);

+ 1 - 0
tools/src/Services/Dhcp.php

@@ -61,6 +61,7 @@ class Dhcp extends InitialService
                 ->addVolumes(self::DHCP_SOCKET_VOLUMEN, "/run/php/")
                 ->addVolumes(self::DHCP_KEA_VOLUMEN, "/opt/dhcp/web/kea")
                 ->addVolumes(Nginx::DHCP_NGINX_VOLUMEN, "/opt/dhcp/web")
+                ->addVolumes("./tftpboot", "/tftpboot")
                 ->network($this->getRelease()->_network_name)->ipv4_address($this->generateIP($this->ip_server));
             $this->addLink(new Mysql(), $module)
                 ->addLink(new Base(), $module);

+ 3 - 2
tools/src/Services/Kea.php

@@ -51,13 +51,14 @@ class Kea extends InitialService
             if ($this->getProduction() === false) {
                 $this->getComposer()->service($module)
                     ->build("./$module/1.4.0/kea-ik")
-                    ->addVolumes("./kea/conf/kea-ctrl-agent.conf", "/usr/local/etc/kea/kea-ctrl-agent.conf")
-                    ->addVolumes("./kea/conf/kea-dhcp4.conf", "/usr/local/etc/kea/kea-dhcp4.conf")
                     ->addVolumes("./kea/supervisord", "/etc/supervisord")
                     ->addVolumes("./kea/hooks", "/opt/hooks");
             }
             $this->getComposer()->service($module)
                 ->addVolumes(Dhcp::DHCP_KEA_VOLUMEN, "/opt/kea/conf")
+                ->addVolumes("./tftpboot", "/tftpboot")
+                ->addVolumes("./kea/conf/kea-ctrl-agent.conf", "/usr/local/etc/kea/kea-ctrl-agent.conf")
+                ->addVolumes("./kea/conf/kea-dhcp4.conf", "/usr/local/etc/kea/kea-dhcp4.conf")
                 ->network($this->getRelease()->_network_name)->ipv4_address($this->generateIP($this->ip_server));
             $this->getRelease()->writeVariablesEnviroment($module . "." . $host_env_file, $module,
                 array(

+ 0 - 12
updateSupport.sh

@@ -99,9 +99,6 @@ then
     echo -e "${BLUE}###############################################################${NOCOLOR}"
     echo -e "Parando las imagenes actauales"
     docker stop $(docker ps -q)
-    sleep 20
-    echo -e "Recuperando las nuevas imagenes"
-    docker-compose pull
     ###################################################################
     if [ "$CLIENT" = "" ];
     then
@@ -143,15 +140,6 @@ then
     COMMAND=""
     eval ${DOCKERMAKEINSTALL}
     fcCheckExecution
-    ###################################################################
-#    echo -e ""
-#    echo -e ""
-#    echo -e ""
-#    echo -e ""
-#    echo -e "${BLUE}###############################################################${NOCOLOR}"
-#    echo -e "Reconfigurando el nginx"
-#    eval ${DOCKERFIXNGINX}
-#    fcCheckExecution
 fi
 ###################################################################
 echo -e ""