From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Thu, 20 Jun 2024 06:43:30 +0000 (+0200)
Subject: wip #6968 @1
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=f9a424bbd9a6c6e792007ca93229b4db909052c6;p=fluidbook-toolbox.git

wip #6968 @1
---

diff --git a/.docker/alpha/update.sh b/.docker/alpha/update.sh
index 127adb2a0..af43b568e 100644
--- a/.docker/alpha/update.sh
+++ b/.docker/alpha/update.sh
@@ -2,8 +2,7 @@
 cd /docker/fluidbook-toolbox-alpha
 docker plugin install ucphhpc/sshfs --grant-all-permissions
 docker network create fluidbook-toolbox-alpha
-docker compose down
-docker volume rm fluidbook-toolbox-alpha_sshfsusstorage
+docker compose down -v
 docker compose up -d
 docker exec -it fluidbook-toolbox-alpha /application/scripts/update.sh
 find /data/toolbox/alpha/ -type d \( -path /data/toolbox/alpha/.docker \) -prune -o -exec chown -R toolbox:www-data {} \;
diff --git a/.docker/dev/update.sh b/.docker/dev/update.sh
index eed5ba7d9..95f910599 100644
--- a/.docker/dev/update.sh
+++ b/.docker/dev/update.sh
@@ -4,9 +4,7 @@ docker plugin install ucphhpc/sshfs --grant-all-permissions
 chown root:root /home/toolbox/dev/.docker/config/cron/host;ln -sf /home/toolbox/dev/.docker/config/cron/host /etc/cron.d/toolbox
 chown root:root /home/toolbox/dev/.docker/config/sudoers
 docker network create fluidbook-toolbox-dev
-docker compose down
-docker volume rm fluidbook-toolbox-dev_sshfsusstorage
-docker volume rm fluidbook-toolbox-dev_docsdev
+docker compose down -v
 docker compose up -d
 docker exec -it fluidbook-toolbox-dev /application/scripts/update.sh
 /home/toolbox/dev/scripts/fixrights.sh
diff --git a/.docker/update.sh b/.docker/update.sh
index cc1b6ac05..9b54f061f 100644
--- a/.docker/update.sh
+++ b/.docker/update.sh
@@ -4,9 +4,7 @@ docker plugin install ucphhpc/sshfs --grant-all-permissions
 chown root:root /home/toolbox/www/.docker/config/cron/host;ln -sf /home/toolbox/www/.docker/config/cron/host /etc/cron.d/toolbox
 chown root:root /home/toolbox/www/.docker/config/sudoers
 docker network create fluidbook-toolbox
-docker compose down
-docker volume rm fluidbook-toolbox_sshfsusstorage
-docker volume rm fluidbook-toolbox_docs1
+docker compose down -v
 docker compose up -d
 docker exec -it fluidbook-toolbox /application/scripts/update.sh
 /home/toolbox/www/scripts/fixrights.sh
diff --git a/app/Fluidbook/Compiler/Compiler.php b/app/Fluidbook/Compiler/Compiler.php
index 404515319..210016fdf 100644
--- a/app/Fluidbook/Compiler/Compiler.php
+++ b/app/Fluidbook/Compiler/Compiler.php
@@ -705,7 +705,7 @@ class Compiler extends Base implements CompilerInterface, IVirtualDirectoryError
                 $this->log('Start compile process');
 
                 // Raw copy of some directories
-                $directories = array('style/fonts/OpenSans', 'images', 'sound');
+                $directories = ['style/fonts/OpenSans', 'images', 'sound'];
                 foreach ($directories as $directory) {
                     $from = $this->assets . '/' . $directory;
                     $this->vdir->copyDirectory($from, $directory);