فهرست منبع

FD3-712 update playbook

Espinoza Guillermo 6 سال پیش
والد
کامیت
a884ad3e49
2فایلهای تغییر یافته به همراه10 افزوده شده و 7 حذف شده
  1. 1 1
      tools/playbook_v2.yml
  2. 9 6
      tools/src/ReleaseV2.php

+ 1 - 1
tools/playbook_v2.yml

@@ -181,7 +181,7 @@
         path: "/opt/base/var/cache/"
 
     - name: Composer install
-      shell: "eval $(ssh-agent) ;  ssh-add /opt/keys/bitbucket.id_rsa ; composer install --no-interaction"
+      shell: "chmod 777 -r /opt/base/var/cache ; eval $(ssh-agent) ;  ssh-add /opt/keys/bitbucket.id_rsa ; composer install --no-interaction"
 
     - name: Load redirections
       set_fact:

+ 9 - 6
tools/src/ReleaseV2.php

@@ -518,15 +518,18 @@ class ReleaseV2 extends Release
         $module = "pma";
         $host_env_file = "host.env";
         extract($config);
-        
-        $service = $this->aux1($composer, $module, $config);
-        
-        $service
+
+        $composer
+            ->addService("pma")
+            ->image("phpmyadmin/phpmyadmin")
+            ->restart($this->_docker_restart_default)
             ->addLinks("mysql", "mysql")
-            ->addEnv_file("mysql.{$host_env_file}")
+            ->addEnv_file("host.env")
+            ->addEnv_file("mysql." . $host_env_file)
+            ->addEnv_file($module . "." . $host_env_file)
             ->addVolumes("pma_volumen", "/www");
 
-        $this->writeVariablesEnviroment("{$module}.{$host_env_file}", $module);
+        $this->writeVariablesEnviroment($module . "." . $host_env_file, $module);
     }
 
     function addGrafana(FileFormat2 $composer, $config = array())