Merge branch 'develop' into mtalbott-runtimes

DataBiosphere · Jan 9, 2025 · 5702f8c · 5702f8c
2 parents d1b123e + 59aaba2
commit 5702f8c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/http/src/main/resources/init-resources/shutdown.sh b/http/src/main/resources/init-resources/shutdown.sh
@@ -37,4 +37,4 @@ else
   DOCKER_COMPOSE='docker-compose'
 fi
 
-$DOCKER_COMPOSE down
+$DOCKER_COMPOSE down
diff --git a/http/src/main/resources/init-resources/startup.sh b/http/src/main/resources/init-resources/startup.sh
@@ -243,7 +243,6 @@ RUNTIME_NAME=${RUNTIME_NAME}
 OWNER_EMAIL=${OWNER_EMAIL}
 PET_SA_EMAIL=${PET_SA_EMAIL}
 WELDER_ENABLED=${WELDER_ENABLED}
-MEM_LIMIT=${MEM_LIMIT}
 SHM_SIZE=${SHM_SIZE}
 END
 
@@ -256,6 +255,9 @@ END
         docker restart $JUPYTER_SERVER_NAME
         docker restart $WELDER_SERVER_NAME
 
+        # update memory size, the memory swap must be updated as well (cannot be < memory)
+        docker update  --memory ${MEM_LIMIT} --memory-swap ${MEM_LIMIT}  $JUPYTER_SERVER_NAME
+
         log 'Copy Jupyter frontend notebook config...'
         $GSUTIL_CMD cp ${JUPYTER_NOTEBOOK_FRONTEND_CONFIG_URI} /var
         JUPYTER_NOTEBOOK_FRONTEND_CONFIG=`basename ${JUPYTER_NOTEBOOK_FRONTEND_CONFIG_URI}`
@@ -277,14 +279,16 @@ RUNTIME_NAME=${RUNTIME_NAME}
 OWNER_EMAIL=${OWNER_EMAIL}
 PET_SA_EMAIL=${PET_SA_EMAIL}
 WELDER_ENABLED=${WELDER_ENABLED}
-MEM_LIMIT=${MEM_LIMIT}
 SHM_SIZE=${SHM_SIZE}
 END
 
         # We do not want to recreate a new container, to make sure we preserve the changes that users made with the startup script
         # We only want to restart the existing container with the latest environment variables
         ${DOCKER_COMPOSE} --env-file=/var/variables.env ${COMPLETE_RSTUDIO_DOCKER_COMPOSE} up -d --no-recreate
 
+        # update memory size, the memory swap must be updated as well (cannot be < memory)
+        docker update  --memory ${MEM_LIMIT} --memory-swap ${MEM_LIMIT} $RSTUDIO_SERVER_NAME
+
         # the docker containers need to be restarted or the R container
         # will fail to start until the appropriate volume/device exists.
         docker restart $RSTUDIO_SERVER_NAME