wait #7077 @2

diff --git a/app/Fluidbook/Packager/Packager.php b/app/Fluidbook/Packager/Packager.php
index ba9ae08d872090ae60aa06e1a249604d70c81b04..c6b2a6fcc82c691e6f2f2dbefb01c360068a1d1c 100644 (file)
--- a/app/Fluidbook/Packager/Packager.php
+++ b/app/Fluidbook/Packager/Packager.php
@@ -91,6 +91,8 @@ class Packager extends \App\Jobs\Base
             case 'win_inss_html':
             case 'win_inss':
             case 'win_exe':
+            case 'win':
+            case 'exe':
                 $packager = new WindowsEXE($book_id, null, $options);
                 break;
             case 'win_cd_html':

diff --git a/app/Fluidbook/Packager/WindowsZIP.php b/app/Fluidbook/Packager/WindowsZIP.php
index 5ff834fb8d8eeac48330c0589524ae2b7d0a61d5..ea815dc169b2e1ce77f0fdbc4cd6a41fd28c2268 100644 (file)
--- a/app/Fluidbook/Packager/WindowsZIP.php
+++ b/app/Fluidbook/Packager/WindowsZIP.php
@@ -139,6 +139,10 @@ class WindowsZIP extends Packager
 
     function _sign($source, $symbolicLink = false)
     {
+        $cli = new CommandLine('/application/bin/mount.sh');
+        $cli->setSudo(true);
+        $cli->execute();
+
         $rand = 'sign-' . hash_file('sha256', $source) . '.exe';
         $remote = '/mnt/sign/' . $rand;
 

diff --git a/resources/tools/dockerwebcontainer/mysql b/resources/tools/dockerwebcontainer/mysql
index 7321f9a4855c330b72cb7e4ea5c49bf2bd1c6749..9598e21b5b474e0eb0c970aad39228da06a1ffff 100644 (file)
--- a/resources/tools/dockerwebcontainer/mysql
+++ b/resources/tools/dockerwebcontainer/mysql
@@ -1,7 +1,9 @@
     adminer:
-      image: 'adminer:latest'
+      image: 'shyim/adminerevo'
       container_name: $name-adminer
       restart: unless-stopped
+      volumes:
+        - "./www/.docker/config/adminer/php.ini:/etc/php/conf.d/99-adminer.ini"
       environment:
         ADMINER_DEFAULT_SERVER: $name-mariadb
         VIRTUAL_HOST: adminer.$domain

diff --git a/resources/tools/dockerwebcontainer/template/config/adminer/php.ini b/resources/tools/dockerwebcontainer/template/config/adminer/php.ini
new file mode 100644 (file)
index 0000000..3b3c80e
--- /dev/null
+++ b/resources/tools/dockerwebcontainer/template/config/adminer/php.ini
@@ -0,0 +1,5 @@
+upload_max_filesize = 500M
+post_max_size = 500M
+memory_limit = 4G
+max_execution_time = 6000
+max_input_vars = 5000