updating guacamole

NeuroDesk · Jan 29, 2024 · a4edc78 · a4edc78
1 parent c6c90a9
commit a4edc78
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -68,7 +68,7 @@ ARG GO_VERSION="1.21.1"
 ARG SINGULARITY_VERSION="3.11.4"
 ARG TOMCAT_REL="9"
 ARG TOMCAT_VERSION="9.0.80"
-ARG GUACAMOLE_VERSION="1.5.3"
+ARG GUACAMOLE_VERSION="1.5.4"
 
 ENV LANG ""
 ENV LANGUAGE ""

diff --git a/build_and_run.sh b/build_and_run.sh
@@ -1,7 +1,11 @@
 set -e
 
 if docker ps --all | grep neurodesktop; then
-    bash stop_and_clean.sh
+    if docker ps --all | grep neurodeskapp; then
+        echo "detected a Neurodeskapp container and ignoring it!"
+    else
+        bash stop_and_clean.sh
+    fi
 fi
 # docker build -t neurodesktop:latest .
 # docker run --shm-size=1gb -it --privileged --name neurodesktop -v ~/neurodesktop-storage:/neurodesktop-storage -e HOST_UID="$(id -u)" -e HOST_GID="$(id -g)" -p 8080:8080 neurodesktop:latest