fix error when starting multiple windows due to conflict in container…

… name
NeuroDesk · Jan 24, 2024 · 737f704 · 737f704
1 parent fd49fc9
commit 737f704
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "neurodeskapp",
   "jlab_version": "4.0.0-1",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "Neurodesk App",
   "main": "./build/out/main/main.js",
   "scripts": {

diff --git a/src/main/config/sessionconfig.ts b/src/main/config/sessionconfig.ts
@@ -18,7 +18,7 @@ export class SessionConfig {
   width: number = DEFAULT_WIN_WIDTH;
   height: number = DEFAULT_WIN_HEIGHT;
   remoteURL: string = '';
-  persistSessionData: boolean = true;
+  persistSessionData: boolean = false;
   partition: string = '';
   workingDirectory: string = '';
   filesToOpen: string[] = [];

diff --git a/src/main/server.ts b/src/main/server.ts
@@ -58,7 +58,7 @@ function createLaunchScript(
   // be followed by equals sign without a space; this can be
   // removed once jupyter_server requires traitlets>5.0
   const launchArgs = [
-    `docker volume create neurodesk-home && docker run -d --shm-size=1gb -it --privileged --user=root --name neurodeskapp -p ${strPort}:${strPort} --mount source=neurodesk-home,target=/home/jovyan`
+    `docker volume create neurodesk-home && docker run -d --shm-size=1gb -it --privileged --user=root --name neurodeskapp-${strPort} -p ${strPort}:${strPort} --mount source=neurodesk-home,target=/home/jovyan`
   ];
   launchArgs.push(
     `${
@@ -97,23 +97,23 @@ function createLaunchScript(
         FOR /F "usebackq delims=" %%i IN (\`docker image inspect vnmd/neurodesktop:${tag} --format="exists" 2^>nul\`) DO SET IMAGE_EXISTS=%%i
         if "%IMAGE_EXISTS%"=="exists" (
             echo "Image exists"
-            FOR /F "usebackq delims=" %%i IN (\`docker container inspect -f "{{.State.Status}}" neurodeskapp\`) DO SET CONTAINER_STATUS=%%i
-              docker stop neurodeskapp && docker rm neurodeskapp 
+            FOR /F "usebackq delims=" %%i IN (\`docker container inspect -f "{{.State.Status}}" neurodeskapp-${strPort}\`) DO SET CONTAINER_STATUS=%%i
+              docker stop neurodeskapp-${strPort} && docker rm neurodeskapp-${strPort} 
               ${launchCmd}
         ) else (
             echo "Image does not exist"
-            docker stop neurodeskapp && docker rm neurodeskapp 
+            docker stop neurodeskapp-${strPort} && docker rm neurodeskapp-${strPort} 
             docker pull vnmd/neurodesktop:${tag}
             ${launchCmd}
         )
       `;
   } else {
     script = `
         if [[ "$(docker image inspect vnmd/neurodesktop:${tag} --format='exists' 2> /dev/null)" == "exists" ]]; then 
-              docker stop neurodeskapp && docker rm neurodeskapp 
+              docker stop neurodeskapp-${strPort} && docker rm neurodeskapp-${strPort} 
               ${launchCmd}
         else
-          docker stop neurodeskapp && docker rm neurodeskapp 
+          docker stop neurodeskapp-${strPort} && docker rm neurodeskapp-${strPort} 
           docker pull vnmd/neurodesktop:${tag}
           ${launchCmd}
         fi