fix(mongo s3 library storage): windows paths converted to unix format

Lumieducation · Feb 23, 2022 · cd9c1c0 · cd9c1c0
1 parent 668aca2
commit cd9c1c0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/packages/h5p-server/src/LibraryManager.ts b/packages/h5p-server/src/LibraryManager.ts
@@ -1,6 +1,7 @@
 import { Readable } from 'stream';
 import fsExtra from 'fs-extra';
 import { getAllFiles } from 'get-all-files';
+import upath from 'upath';
 
 import H5pError from './helpers/H5pError';
 import Logger from './helpers/Logger';
@@ -94,7 +95,7 @@ export default class LibraryManager {
         if (!this.config) {
             this.config = {
                 installLibraryLockMaxOccupationTime: 10000,
-                installLibraryLockTimeout: 20000
+                installLibraryLockTimeout: 120000
             };
         }
     }
@@ -770,7 +771,7 @@ export default class LibraryManager {
                     fsExtra.createReadStream(fileFullPath);
                 return this.libraryStorage.addFile(
                     libraryInfo,
-                    fileLocalPath,
+                    upath.toUnix(fileLocalPath),
                     readStream
                 );
             })

diff --git a/scripts/mongo-s3-docker-compose.yml b/scripts/mongo-s3-docker-compose.yml
@@ -20,10 +20,10 @@ services:
         ports:
             - 9000:9000
             - 9001:9001
-        command: ['server', '--console-address', ':9001', '/data']
+        command: ['server', '/data']
         environment:
-            MINIO_ROOT_USER: minioaccesskey
-            MINIO_ROOT_PASSWORD: miniosecret
+            MINIO_ACCESS_KEY: minioaccesskey
+            MINIO_SECRET_KEY: miniosecret
 
 volumes:
     mongodb_data: