wip #6968 @1

diff --git a/.docker/alpha/update.sh b/.docker/alpha/update.sh
index 127adb2a0b6fcc9eb2fa5c29d32803a4e34e123d..af43b568e0967287606f206e4b99908e3f32d808 100644 (file)
--- 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 eed5ba7d9aba66eab5dc2c64320f14b8f7746826..95f9105996bd1118e3c4e365ff8efbaad182e937 100644 (file)
--- 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 cc1b6ac054866b65947c1420aa20f8d61c016fef..9b54f061f9b456de487f673ea4d5026dbcad817a 100644 (file)
--- 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 40451531958c2b241d4ac12842a384664858fa9e..210016fdf4f340c681a029f3cd66b208d37ba20e 100644 (file)
--- 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);