wait #5422 @0.5

diff --git a/.docker/build b/.docker/build
index 379f415c1c45f0fdd2e1995b426b309fd3038e05..1ff82a29f3df12e9fc398814ddf33596e3970ded 100644 (file)
--- a/.docker/build
+++ b/.docker/build
@@ -1,3 +1,4 @@
 #!/bin/sh
+cd /docker/fluidbook-toolbox
 COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose pull
 COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose build

diff --git a/.docker/images/php/Dockerfile b/.docker/images/php/Dockerfile
index f4d67c893e273147567ab974a1c2779e8f3cfb5f..59ca1f4fe84156711a9bcb49841530de9d57a4d0 100644 (file)
--- a/.docker/images/php/Dockerfile
+++ b/.docker/images/php/Dockerfile
@@ -71,7 +71,7 @@ RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/do
 
 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 sass puppeteer
+RUN npm install --unsafe-perm --global uglify-js less sass puppeteer favicons
 
 # PHP-FPM packages need a nudge to make them docker-friendly
 COPY overrides.conf /etc/php/8.1/fpm/pool.d/z-overrides.conf

diff --git a/app/Http/Controllers/Admin/Operations/Tools/Favicon.php b/app/Http/Controllers/Admin/Operations/Tools/Favicon.php
index 95643613919e09da842a967cb064f2c932932024..e0ce99bd14db1fe3d6c4efe41ff0637ac62d1430 100644 (file)
--- a/app/Http/Controllers/Admin/Operations/Tools/Favicon.php
+++ b/app/Http/Controllers/Admin/Operations/Tools/Favicon.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Admin\Operations\Tools;
 
 use Cubist\Backpack\Magic\Fields\StandardFile;
 use Cubist\Backpack\Magic\Form;
+use Cubist\Util\CommandLine;
 use Cubist\Util\CommandLine\Npx;
 use Cubist\Util\Files\Files;
 use Cubist\Util\Zip;
@@ -48,9 +49,7 @@ trait Favicon
             return $out;
         }
 
-        $cli = new Npx();
-        $cli->setJson(true);
-        $cli->setModule('favicons-compiled-cli');
+        $cli = new CommandLine('favicons');
         $cli->setArg('i', $path);
         $cli->setArg('o', $out);
         $cli->setArg('c', resource_path('tools/favicon/config.json'));