From 5015e3a34288ab5a8273b29d2262efdd6b2a6046 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Tue, 30 Aug 2022 15:05:27 +0200 Subject: [PATCH] wait #5424 @4 --- .docker/config/mariadb/connections.cnf | 2 +- .docker/config/mariadb/finetuning.cnf | 14 + .docker/docker-compose.yml | 2 + .docker/images/php/Dockerfile | 9 +- .../FluidbookPublication/PreviewOperation.php | 4 +- app/Jobs/GenerateThemePreview.php | 2 +- app/Jobs/UpdateWS2ThemeTable.php | 2 +- app/Models/FluidbookPublication.php | 14 +- app/Models/FluidbookTheme.php | 8 +- package-lock.json | 21671 ++++++++-------- package.json | 2 +- .../social_screenshot/social_screenshot.js | 11 +- .../theme_preview/install-mouse-helper.js | 0 .../theme_preview/theme_preview.js | 70 + resources/js/theme_preview/theme_preview.js | 54 - 15 files changed, 10362 insertions(+), 11503 deletions(-) create mode 100644 .docker/config/mariadb/finetuning.cnf rename resources/{js => fluidbooktheme}/theme_preview/install-mouse-helper.js (100%) create mode 100644 resources/fluidbooktheme/theme_preview/theme_preview.js delete mode 100644 resources/js/theme_preview/theme_preview.js diff --git a/.docker/config/mariadb/connections.cnf b/.docker/config/mariadb/connections.cnf index b8da42375..f623ae6ab 100644 --- a/.docker/config/mariadb/connections.cnf +++ b/.docker/config/mariadb/connections.cnf @@ -1,2 +1,2 @@ [mariadb] -max_connections = 300 +max_connections = 1024 diff --git a/.docker/config/mariadb/finetuning.cnf b/.docker/config/mariadb/finetuning.cnf new file mode 100644 index 000000000..11c476589 --- /dev/null +++ b/.docker/config/mariadb/finetuning.cnf @@ -0,0 +1,14 @@ +[mariadb] + +skip-name-resolve + +key_buffer_size = 128M +max_allowed_packet = 512M +max_heap_table_size = 512M +tmp_table_size = 256M + +innodb_buffer_pool_size = 4G + +join_buffer_size = 32M +join_buffer_space_limit = 256M +join_cache_level = 12 diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml index d1e2d3e4f..7ee9d6a64 100644 --- a/.docker/docker-compose.yml +++ b/.docker/docker-compose.yml @@ -22,6 +22,8 @@ services: container_name: fluidbook-toolbox build: /data1/extranet/toolbox/.docker/images/php working_dir: /application + environment: + TZ: Europe/Paris volumes: - '/data1/extranet/toolbox/.docker/config/ssh/:/root/.ssh/' - '/data1/extranet/toolbox/.docker/config/ssh/:/application/.ssh/' diff --git a/.docker/images/php/Dockerfile b/.docker/images/php/Dockerfile index d2f216235..11ff1229a 100644 --- a/.docker/images/php/Dockerfile +++ b/.docker/images/php/Dockerfile @@ -66,8 +66,12 @@ RUN apt-get update \ STOPSIGNAL SIGQUIT # Toolbox -RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && apt-get install -y nodejs +RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash - +RUN sh -c 'echo "deb [arch=amd64] https://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list' +RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - +RUN apt-get update +RUN apt-get -y --no-install-recommends install nodejs google-chrome-stable RUN apt-get -y --no-install-recommends install sudo RUN apt-get -y --no-install-recommends install supervisor ssh rsync RUN apt-get -y --no-install-recommends install nsis @@ -76,12 +80,13 @@ RUN apt-get -y --no-install-recommends install zip unzip gzip 7zip RUN apt-get -y --no-install-recommends install icoutils fontforge RUN apt-get -y --no-install-recommends install ffmpeg python3 lame RUN apt-get -y --no-install-recommends install inkscape mupdf-tools -RUN apt-get -y --no-install-recommends install cron monit +RUN apt-get -y --no-install-recommends install cron monit locate RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* RUN curl -L https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp -o /usr/local/bin/yt-dlp && chmod a+rx /usr/local/bin/yt-dlp && ln -s /usr/local/bin/yt-dlp /usr/local/bin/youtube-dl RUN groupadd sudo;useradd -d /application -g www-data -G sudo -s /bin/bash -u 1001 toolbox +ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true RUN npm install --unsafe-perm --global uglify-js less puppeteer favicons-compiled-cli # PHP-FPM packages need a nudge to make them docker-friendly diff --git a/app/Http/Controllers/Admin/Operations/FluidbookPublication/PreviewOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookPublication/PreviewOperation.php index b0bddfffa..9d6640813 100644 --- a/app/Http/Controllers/Admin/Operations/FluidbookPublication/PreviewOperation.php +++ b/app/Http/Controllers/Admin/Operations/FluidbookPublication/PreviewOperation.php @@ -50,6 +50,7 @@ trait PreviewOperation return $this->loadingCompile($url, $id, $hash); } + self::_getFluidbookAndTheme($id, $hash, $fluidbook, $theme); $check = $this->_checkDemoLinkAuth($fluidbook); if ($check !== true) { @@ -73,6 +74,7 @@ trait PreviewOperation if ($fluidbook->disableDemo) { abort(404); } + return true; } @@ -100,7 +102,7 @@ trait PreviewOperation window.location=url; }; '; - if (!request()->input('shortLoading', false)) { + if (!request('shortLoading', false)) { $res .= ''; $res .= '