From 7f85e44c653344541d9b83b1980ee61f88ff5ea9 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Mon, 23 Sep 2024 11:59:08 +0200 Subject: [PATCH] wait #7077 @2 --- app/Fluidbook/Packager/Packager.php | 2 ++ app/Fluidbook/Packager/WindowsZIP.php | 4 ++++ resources/tools/dockerwebcontainer/mysql | 4 +++- .../tools/dockerwebcontainer/template/config/adminer/php.ini | 5 +++++ 4 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 resources/tools/dockerwebcontainer/template/config/adminer/php.ini diff --git a/app/Fluidbook/Packager/Packager.php b/app/Fluidbook/Packager/Packager.php index ba9ae08d8..c6b2a6fcc 100644 --- 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 5ff834fb8..ea815dc16 100644 --- 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 7321f9a48..9598e21b5 100644 --- 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 index 000000000..3b3c80ee6 --- /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 -- 2.39.5