From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Thu, 11 Jul 2024 09:55:09 +0000 (+0200)
Subject: wait #6997 @1.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=607d8354dea4930c951625f6f2a0235c3ce681a4;p=fluidbook-toolbox.git

wait #6997 @1.5
---

diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index e91d5a667..cf2b523ea 100644
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -14,7 +14,6 @@ services:
       - '/home/toolbox/www/:/application/'
       - '/home/extranet/:/home/extranet/'
       - '/data/extranet/:/data/extranet/'
-      - '/mnt/:/mnt/'
       - '/home/extranet/share/:/application/share/'
       - '/data/toolbox/storage/:/application/storage/'
       - '/data/extranet/ftp/:/application/ftp/'
@@ -83,7 +82,6 @@ services:
       - '/home/toolbox/www/:/application/'
       - '/home/extranet/:/home/extranet/'
       - '/data/extranet/:/data/extranet/'
-      - '/mnt/:/mnt/'
       - '/home/extranet/share/:/application/share/'
       - '/data/toolbox/storage/:/application/storage/'
       - '/data/extranet/ftp/:/application/ftp/'
diff --git a/app/Fluidbook/Packager/Download.php b/app/Fluidbook/Packager/Download.php
index ee11d7a29..53fca26a0 100644
--- a/app/Fluidbook/Packager/Download.php
+++ b/app/Fluidbook/Packager/Download.php
@@ -8,6 +8,7 @@ use App\Services\ScormCloud;
 use Cubist\Backpack\Facades\App;
 use Cubist\Backpack\Magic\Models\ExternalServer;
 use Cubist\Net\Transfer\Driver;
+use Cubist\Net\Transfer\Local;
 use Cubist\Util\CommandLine\Rsync;
 use Cubist\Util\Files\Files;
 use Cubist\Util\Text;
@@ -130,6 +131,7 @@ class Download extends DownloadBase
                 $text = __($this->_installText, $translateVariables);
                 $path = $this->_compileandpackage(false);
 
+                /** @var Local $driver */
                 $driver = $server->getTransferDriver();
                 $driver->copy($path, $dest, false, false);
 
diff --git a/bin/startup.sh b/bin/startup.sh
index ad1cba5c6..d1669d489 100644
--- a/bin/startup.sh
+++ b/bin/startup.sh
@@ -40,7 +40,7 @@ chmod -R 700 /etc/monit;chown -R root:root /etc/monit;/usr/bin/monit
 chown -R root:root /etc/monit && /usr/bin/monit
 
 # Mounts
-/application/bin/mount.sh
+/application/bin/mount.sh &
 
 # Launch PHP
 /usr/sbin/php-fpm8.2 -O