wip #5430 @1.5

diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index 31fb94b951b259ffce67face2950eeb8ab955dab..fd741e8fe7044d7d92e879395eb92722aa32df41 100644 (file)
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -45,7 +45,7 @@ services:
       - '/mnt/sshfs/godzilla/data/fluidbook/docs/:/data1/extranet/www/fluidbook/docs/'
     tmpfs:
       - '/tmp:uid=1001,gid=33'
-      - '/application/storage/framework/cache:uid=1001,gid=33'
+      - '/application/storage/framework:uid=1001,gid=33'
     ports:
       - '58744:8123'
     networks:

diff --git a/app/Http/Controllers/API/CacheAPIController.php b/app/Http/Controllers/API/CacheAPIController.php
new file mode 100644 (file)
index 0000000..e9985a0
--- /dev/null
+++ b/app/Http/Controllers/API/CacheAPIController.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Controllers\API;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\Cache;
+
+class CacheAPIController extends Controller
+{
+    public function clear($tag = null)
+    {
+        if (null === $tag) {
+            Cache::flush();
+        } else {
+            $tags = explode(',', $tag);
+            foreach ($tags as $tag) {
+                Cache::tags([$tag])->flush();
+            }
+        }
+        Artisan::call('cubist:magic:precache');
+    }
+}

diff --git a/app/Http/Controllers/API/FluidbookThemeAPIController.php b/app/Http/Controllers/API/FluidbookThemeAPIController.php
index 8de2014461f8bc6ae412560edc0cf2b155f257b1..fe818501dce4314bf9836c07d6536f2ebb6648ea 100644 (file)
--- a/app/Http/Controllers/API/FluidbookThemeAPIController.php
+++ b/app/Http/Controllers/API/FluidbookThemeAPIController.php
@@ -5,14 +5,12 @@ namespace App\Http\Controllers\API;
 
 
 use App\Http\Controllers\Controller;
-use App\Jobs\GenerateThemePreview;
 use App\Models\FluidbookTheme;
 use Cubist\Backpack\Magic\Fields\Checkbox;
 use Cubist\Backpack\Magic\Fields\Color;
 use Cubist\Backpack\Magic\Fields\Files;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
-use Spatie\MediaLibrary\MediaCollections\Models\Media;
 
 class FluidbookThemeAPIController extends Controller
 {

diff --git a/config/cache.php b/config/cache.php
index 40001634237574a6c9cabde461d093cf268478b7..326d9afc67223db02f37932374b38304bad1e69a 100644 (file)
--- a/config/cache.php
+++ b/config/cache.php
@@ -49,7 +49,7 @@ return [
 
         'file' => [
             'driver' => 'file',
-            'path' => storage_path('framework'),
+            'path' => storage_path('framework/cache'),
         ],
 
         'memcached' => [
@@ -98,6 +98,6 @@ return [
     |
     */
 
-    'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache'),
+    'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_') . '_cache'),
 
 ];

diff --git a/routes/api.php b/routes/api.php
index 9b424226303f5909ee413b8e90a707b162c0120d..986a5ec3df9cbf767a12fc3177904778d6101bc9 100644 (file)
--- a/routes/api.php
+++ b/routes/api.php
@@ -22,6 +22,7 @@ Route::group([
     Route::put('fluidbook-theme/{id}/rename', [\App\Http\Controllers\API\FluidbookThemeAPIController::class, 'renamefromws2']);
     Route::put('fluidbook-theme/{id}/uploadfile/{fieldname}', [\App\Http\Controllers\API\FluidbookThemeAPIController::class, 'uploadfile']);
     Route::delete('fluidbook-theme/{id}', [\App\Http\Controllers\API\FluidbookThemeAPIController::class, 'deletefromws2']);
+    Route::post('cache/clear/{tag?}', [\App\Http\Controllers\API\CacheAPIController::class, 'clear']);
 });
 
 

diff --git a/scripts/dockerterminal.bat b/scripts/dockerterminal.bat
index defb9166cf6129f0861f82cbf47db1baafbfe8ba..70177327cf568c175793836f21be2accc805068f 100644 (file)
--- a/scripts/dockerterminal.bat
+++ b/scripts/dockerterminal.bat
@@ -1,3 +1,3 @@
 @echo off
 cls
-C:\tools\cygwin\bin\ssh.exe -t root@alien.cubedesigners.com 'docker exec -it fluidbook-toolbox /bin/bash'
+C:\tools\cygwin\bin\ssh.exe -t root@alien.cubedesigners.com 'docker exec -it -u toolbox fluidbook-toolbox /bin/bash'

diff --git a/scripts/update b/scripts/update
index 1add09cc7f804fb40d8d2ce5d8a665fa1991a740..dc470a94b572959419339387759a7959238add19 100644 (file)
--- a/scripts/update
+++ b/scripts/update
@@ -1,5 +1,11 @@
 #!/bin/sh
 cd /application
+mkdir -p /application/storage/framework/cache/cache
+mkdir -p /application/storage/framework/views
+mkdir -p /application/storage/framework/sessions
+mkdir -p /application/storage/framework/testing
+sudo chown -R 1001:33 /application/storage/framework
+sudo chown -R 1001:33 /root/.npm
 composer update
 chmod 755 ./scripts/*
 php artisan lang:add fr en
@@ -7,8 +13,7 @@ php artisan fluidbook:player:updatesources
 php artisan cubist:magic:migrate
 php artisan cubist:magic:generate
 composer dump-autoload
-/application/scripts/restartworkers
+sudo /application/scripts/restartworkers
+/application/scripts/updatenpm
 php artisan optimize:clear
-chown -R 1001:33 "/root/.npm"
-chown -R 1001:33 "vendor"
-runuser -l toolbox -c './scripts/updatenpm'
+php artisan cubist:magic:precache