From 4dd998faf198c4d5c5fbf8bdaa381b3679c34f75 Mon Sep 17 00:00:00 2001 From: Brett Taylor Date: Mon, 1 Nov 2021 16:58:49 -0400 Subject: [PATCH 1/2] include a fix for filepath in docker on arm --- .../Foundations/TS/Task-Modules/FileStorage.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Projects/Foundations/TS/Task-Modules/FileStorage.js b/Projects/Foundations/TS/Task-Modules/FileStorage.js index 75a0a4e32..47dc1b91a 100644 --- a/Projects/Foundations/TS/Task-Modules/FileStorage.js +++ b/Projects/Foundations/TS/Task-Modules/FileStorage.js @@ -451,9 +451,16 @@ exports.newFileStorage = function newFileStorage(processIndex, host, port) { function getFileViaHTTP(filePath, callback, callBackFunction) { try { - - /* The filePath received is the one that is needed to fetch data from with fs. To do it via http we need to remove the prefix that includes this: ./Data-Storage/ */ - filePath = filePath.substring(15, filePath.length) + /* + The filePath received is the one that is needed to fetch data from with fs. To do it via http we need to remove the + prefix that includes this: ./Data-Storage/ + */ + let pathArray = filePath.split('/') + let indexmax = pathArray.indexOf('My-Data-Storage') // TODO: get rid of hardcoded path name + for (var i = 0; i <= indexmax; i++) { + pathArray.shift() + } + filePath = pathArray.join('/') let http = SA.nodeModules.http let url = 'http://' + host + @@ -506,4 +513,4 @@ exports.newFileStorage = function newFileStorage(processIndex, host, port) { callBackFunction(TS.projects.foundations.globals.standardResponses.DEFAULT_RETRY_RESPONSE); } } -} \ No newline at end of file +} From cbc5eacb5eb8fe16c4adcdb9599becdbfa5c76dd Mon Sep 17 00:00:00 2001 From: ssplatt Date: Tue, 2 Nov 2021 00:00:27 -0400 Subject: [PATCH 2/2] update dockerignore --- .dockerignore | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.dockerignore b/.dockerignore index 3995ec071..3e93e8a5f 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,6 +1,8 @@ -Data-Storage -Log-Files -My-Workspaces +**/Data-Storage +**/My-Data-Storage +**/Log-Files +**/My-Log-Files +**/My-Workspaces debug.log *.db